From ae3cb67a106361940487f40f0c925c729453e02b Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Tue, 25 Dec 2007 15:52:59 +0100
Subject: [PATCH] --- yaml --- r: 76957 b: refs/heads/master c:
 4092d49f705aa19750c39758fa1be767e162c48d h: refs/heads/master i:   76955:
 72a3c7695f98ca8c21c633fe63f350ed660a3b89 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ocfs2/endian.h | 5 -----
 trunk/fs/ocfs2/inode.c  | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6cd5cb18203a..000d12e0b4de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17104683d262fc6ab58488c4a3f0415012acc636
+refs/heads/master: 4092d49f705aa19750c39758fa1be767e162c48d
diff --git a/trunk/fs/ocfs2/endian.h b/trunk/fs/ocfs2/endian.h
index ff257628af16..1942e09f6ee5 100644
--- a/trunk/fs/ocfs2/endian.h
+++ b/trunk/fs/ocfs2/endian.h
@@ -37,11 +37,6 @@ static inline void le64_add_cpu(__le64 *var, u64 val)
 	*var = cpu_to_le64(le64_to_cpu(*var) + val);
 }
 
-static inline void le32_and_cpu(__le32 *var, u32 val)
-{
-	*var = cpu_to_le32(le32_to_cpu(*var) & val);
-}
-
 static inline void be32_add_cpu(__be32 *var, u32 val)
 {
 	*var = cpu_to_be32(be32_to_cpu(*var) + val);
diff --git a/trunk/fs/ocfs2/inode.c b/trunk/fs/ocfs2/inode.c
index 5e19c119183d..7e9e4c79aec7 100644
--- a/trunk/fs/ocfs2/inode.c
+++ b/trunk/fs/ocfs2/inode.c
@@ -620,7 +620,7 @@ static int ocfs2_remove_inode(struct inode *inode,
 	}
 
 	di->i_dtime = cpu_to_le64(CURRENT_TIME.tv_sec);
-	le32_and_cpu(&di->i_flags, ~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));
+	di->i_flags &= cpu_to_le32(~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));
 
 	status = ocfs2_journal_dirty(handle, di_bh);
 	if (status < 0) {