Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[mv-sheeva.git] / fs / ocfs2 / inode.c

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 5e19c119183d0a674b7e21d7ad4a7907a79cecc7..7e9e4c79aec7bf4b3e4488190f47972821a3945f 100644 (file)
--- a/fs/ocfs2/inode.c
+++ b/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) {