diff options
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index e732274f1afd..0fe1aa047f15 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -2419,9 +2419,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, | |||
2419 | goto out_dput; | 2419 | goto out_dput; |
2420 | } | 2420 | } |
2421 | 2421 | ||
2422 | err = d_invalidate(dentry); | 2422 | d_invalidate(dentry); |
2423 | if (err) | ||
2424 | goto out_unlock; | ||
2425 | 2423 | ||
2426 | down_write(&root->fs_info->subvol_sem); | 2424 | down_write(&root->fs_info->subvol_sem); |
2427 | 2425 | ||
@@ -2506,7 +2504,6 @@ out_release: | |||
2506 | btrfs_subvolume_release_metadata(root, &block_rsv, qgroup_reserved); | 2504 | btrfs_subvolume_release_metadata(root, &block_rsv, qgroup_reserved); |
2507 | out_up_write: | 2505 | out_up_write: |
2508 | up_write(&root->fs_info->subvol_sem); | 2506 | up_write(&root->fs_info->subvol_sem); |
2509 | out_unlock: | ||
2510 | if (err) { | 2507 | if (err) { |
2511 | spin_lock(&dest->root_item_lock); | 2508 | spin_lock(&dest->root_item_lock); |
2512 | root_flags = btrfs_root_flags(&dest->root_item); | 2509 | root_flags = btrfs_root_flags(&dest->root_item); |