diff --git a/[refs] b/[refs] index 0cf74f595343..d2b2d4c084ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c0c9da02a2c4289350da6e54202a86602c0f926 +refs/heads/master: 18f39c416d18d74ac11d157e44247253d3fa30ae diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c index 259dd52d8785..fcf1b1b40082 100644 --- a/trunk/fs/btrfs/ioctl.c +++ b/trunk/fs/btrfs/ioctl.c @@ -1446,8 +1446,8 @@ static noinline int btrfs_ioctl_resize(struct file *file, kfree(vol_args); out: mutex_unlock(&root->fs_info->volume_mutex); - mnt_drop_write_file(file); atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); + mnt_drop_write_file(file); return ret; }