summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorMark Fasheh2011-07-26 20:32:23 +0200
committerDavid Sterba2012-03-22 01:45:36 +0100
commitce598979be6f83549c90f42ba522a19a33727611 (patch)
treeee3cb422fb05012b7c5ff52be720a6d68f97de03 /fs/btrfs/inode.c
parentbtrfs: btrfs_drop_snapshot should return int (diff)
downloadkernel-qcow2-linux-ce598979be6f83549c90f42ba522a19a33727611.tar.gz
kernel-qcow2-linux-ce598979be6f83549c90f42ba522a19a33727611.tar.xz
kernel-qcow2-linux-ce598979be6f83549c90f42ba522a19a33727611.zip
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/inode.c')
-rw-r--r--fs/btrfs/inode.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 593a2c3a27ab..41132339e2ea 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6734,10 +6734,9 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
btrfs_i_size_write(inode, 0);
err = btrfs_update_inode(trans, new_root, inode);
- BUG_ON(err);
iput(inode);
- return 0;
+ return err;
}
struct inode *btrfs_alloc_inode(struct super_block *sb)