diff options
author | Jeff Mahoney <jeffm@suse.com> | 2013-07-09 16:37:21 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-09-01 07:57:23 -0400 |
commit | ee3441b49092000402748f5345ee0a3d4c8ac04e (patch) | |
tree | 34ee8c6a2e89451eb8936f5d91d650c3bd475847 /fs/btrfs/ioctl.c | |
parent | 74be9510876a66ad9826613ac8a526d26f9e7f01 (diff) |
btrfs: fall back to global reservation when removing subvolumes
I recently did some ENOSPC testing that involved filling the disk
while create and removing snapshots in a loop. During the test cycle,
I ran into an ENOSPC when trying to remove a snapshot, leaving the fs
stuck in ENOSPC even after a umount/mount cycle.
This patch allow subvolume removal to fall back onto the global
block reservation in order to succeed when it would have failed
otherwise.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 238a05545ee2..841044b80658 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -396,7 +396,7 @@ static noinline int create_subvol(struct inode *dir, | |||
396 | * of create_snapshot(). | 396 | * of create_snapshot(). |
397 | */ | 397 | */ |
398 | ret = btrfs_subvolume_reserve_metadata(root, &block_rsv, | 398 | ret = btrfs_subvolume_reserve_metadata(root, &block_rsv, |
399 | 7, &qgroup_reserved); | 399 | 7, &qgroup_reserved, false); |
400 | if (ret) | 400 | if (ret) |
401 | return ret; | 401 | return ret; |
402 | 402 | ||
@@ -576,7 +576,8 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, | |||
576 | */ | 576 | */ |
577 | ret = btrfs_subvolume_reserve_metadata(BTRFS_I(dir)->root, | 577 | ret = btrfs_subvolume_reserve_metadata(BTRFS_I(dir)->root, |
578 | &pending_snapshot->block_rsv, 7, | 578 | &pending_snapshot->block_rsv, 7, |
579 | &pending_snapshot->qgroup_reserved); | 579 | &pending_snapshot->qgroup_reserved, |
580 | false); | ||
580 | if (ret) | 581 | if (ret) |
581 | goto out; | 582 | goto out; |
582 | 583 | ||
@@ -2174,7 +2175,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, | |||
2174 | * ref/backref. | 2175 | * ref/backref. |
2175 | */ | 2176 | */ |
2176 | err = btrfs_subvolume_reserve_metadata(root, &block_rsv, | 2177 | err = btrfs_subvolume_reserve_metadata(root, &block_rsv, |
2177 | 5, &qgroup_reserved); | 2178 | 5, &qgroup_reserved, true); |
2178 | if (err) | 2179 | if (err) |
2179 | goto out_up_write; | 2180 | goto out_up_write; |
2180 | 2181 | ||