Merge tag 'nfs-for-3.16-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / fs / nfs / pnfs.c

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index ee60c42b72b3bda3d935ee4fe7f90f50b0c86f01..6fdcd233d6f7b2bd7cf254016af820b997b0e6ed 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1782,7 +1782,7 @@ static void pnfs_clear_layoutcommitting(struct inode *inode)
        unsigned long *bitlock = &NFS_I(inode)->flags;
 
        clear_bit_unlock(NFS_INO_LAYOUTCOMMITTING, bitlock);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
        wake_up_bit(bitlock, NFS_INO_LAYOUTCOMMITTING);
 }