Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index 73432e64f8746179e94bcd580984d78f40da823a..e9d97add2b36c9731a8d877e2fd32c7c2e1a382d 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2093,14 +2093,8 @@ EXPORT_SYMBOL(inode_dio_wait);
 void inode_set_flags(struct inode *inode, unsigned int flags,
                     unsigned int mask)
 {
-       unsigned int old_flags, new_flags;
-
        WARN_ON_ONCE(flags & ~mask);
-       do {
-               old_flags = READ_ONCE(inode->i_flags);
-               new_flags = (old_flags & ~mask) | flags;
-       } while (unlikely(cmpxchg(&inode->i_flags, old_flags,
-                                 new_flags) != old_flags));
+       set_mask_bits(&inode->i_flags, mask, flags);
 }
 EXPORT_SYMBOL(inode_set_flags);