diff options
author | Mark Fasheh <mfasheh@suse.com> | 2011-07-26 14:32:23 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2012-03-21 20:45:36 -0400 |
commit | ce598979be6f83549c90f42ba522a19a33727611 (patch) | |
tree | ee3cb422fb05012b7c5ff52be720a6d68f97de03 /fs/btrfs/ioctl.c | |
parent | 2c536799f1bde905bbacf7af3aa6be3f4de66005 (diff) |
btrfs: Don't BUG_ON errors from btrfs_create_subvol_root()
This is called from only one place - create_subvol() which passes errors
safely back out to it's caller, btrfs_mksubvol where they are handled.
Additionally, btrfs_create_subvol_root() itself bug's needlessly from error
return of btrfs_update_inode(). Since create_subvol() was fixed to catch
errors we can bubble this one up too.
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 4e5149461435..de25e4255aeb 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -430,6 +430,11 @@ static noinline int create_subvol(struct btrfs_root *root, | |||
430 | btrfs_record_root_in_trans(trans, new_root); | 430 | btrfs_record_root_in_trans(trans, new_root); |
431 | 431 | ||
432 | ret = btrfs_create_subvol_root(trans, new_root, new_dirid); | 432 | ret = btrfs_create_subvol_root(trans, new_root, new_dirid); |
433 | if (ret) { | ||
434 | /* We potentially lose an unused inode item here */ | ||
435 | goto fail; | ||
436 | } | ||
437 | |||
433 | /* | 438 | /* |
434 | * insert the directory item | 439 | * insert the directory item |
435 | */ | 440 | */ |