summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@redhat.com>2008-07-24 12:17:14 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:05 -0400
commit8e8a1e31f2780b7865d40a8c5142a04f2bcdcb86 (patch)
tree6fe03f25b1cc33f2c881ffd5e54b7e82335c9098 /fs/btrfs/ioctl.c
parent7b1287662304c3cb05cb38f5e3e2d69f386e8f10 (diff)
downloadlinux-stable-8e8a1e31f2780b7865d40a8c5142a04f2bcdcb86.tar.gz
linux-stable-8e8a1e31f2780b7865d40a8c5142a04f2bcdcb86.tar.bz2
linux-stable-8e8a1e31f2780b7865d40a8c5142a04f2bcdcb86.zip
Btrfs: Fix a few functions that exit without stopping their transaction
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index faf081302d02..7d40778a90e4 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -78,8 +78,10 @@ static noinline int create_subvol(struct btrfs_root *root, char *name,
leaf = btrfs_alloc_free_block(trans, root, root->leafsize,
objectid, trans->transid, 0, 0,
0, 0);
- if (IS_ERR(leaf))
- return PTR_ERR(leaf);
+ if (IS_ERR(leaf)) {
+ ret = PTR_ERR(leaf);
+ goto fail;
+ }
btrfs_set_header_nritems(leaf, 0);
btrfs_set_header_level(leaf, 0);