summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann Lombardi <johann@whamcloud.com>2011-03-31 13:23:47 +0000
committerChris Mason <chris.mason@oracle.com>2011-04-05 01:19:42 -0400
commitb44c59a80ded004e1a82712e5f9e17b131c03221 (patch)
tree36588193bf5cc91d80d9d8376d5bad78f2babd0c
parentfe3f566cd19bb6d787c92b2e202c85f929abf3ac (diff)
downloadconfigs-b44c59a80ded004e1a82712e5f9e17b131c03221.tar.gz
Btrfs: fix subvol_sem leak in btrfs_rename()
btrfs_rename() does not release the subvol_sem if the transaction failed to start. Signed-off-by: Johann Lombardi <johann@whamcloud.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/inode.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 62ae9d5da80..1ca3e68586c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6961,8 +6961,10 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
* should cover the worst case number of items we'll modify.
*/
trans = btrfs_start_transaction(root, 20);
- if (IS_ERR(trans))
- return PTR_ERR(trans);
+ if (IS_ERR(trans)) {
+ ret = PTR_ERR(trans);
+ goto out_notrans;
+ }
btrfs_set_trans_block_group(trans, new_dir);
@@ -7062,7 +7064,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
}
out_fail:
btrfs_end_transaction_throttle(trans, root);
-
+out_notrans:
if (old_inode->i_ino == BTRFS_FIRST_FREE_OBJECTID)
up_read(&root->fs_info->subvol_sem);