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

[firefly-linux-kernel-4.4.55.git] / fs / btrfs / ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 6ea15469c63f96f973b572aec64e52cc1b864c58..0d321c23069a0aa9ea1aeac570bdf837cf208d24 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -643,7 +643,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
                return -EINVAL;
 
        atomic_inc(&root->will_be_snapshoted);
-       smp_mb__after_atomic_inc();
+       smp_mb__after_atomic();
        btrfs_wait_nocow_write(root);
 
        ret = btrfs_start_delalloc_inodes(root, 0);