Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[linux-2.6-block.git] / fs / btrfs / btrfs_inode.h

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index a0cf3e56fe20007c8cc1178a97dc734765ecdac7..4794923c410cec258ae30aa929f3fc0bde5ba069 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -279,7 +279,7 @@ static inline void btrfs_inode_block_unlocked_dio(struct inode *inode)
 
 static inline void btrfs_inode_resume_unlocked_dio(struct inode *inode)
 {
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        clear_bit(BTRFS_INODE_READDIO_NEED_LOCK,
                  &BTRFS_I(inode)->runtime_flags);
 }