redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Btrfs: fix subvol_sem leak in btrfs_rename()

Browse source 
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>
This commit is contained in:
Johann Lombardi 2011-03-31 13:23:47 +00:00 committed by Chris Mason
parent fe3f566cd1
commit b44c59a80d
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/btrfs/inode.c
View file

@ -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. * should cover the worst case number of items we'll modify.
*/ */
trans = btrfs_start_transaction(root, 20); trans = btrfs_start_transaction(root, 20);
if (IS_ERR(trans)) if (IS_ERR(trans)) {
return PTR_ERR(trans); ret = PTR_ERR(trans);
goto out_notrans;
}
btrfs_set_trans_block_group(trans, new_dir); 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: out_fail:
btrfs_end_transaction_throttle(trans, root); btrfs_end_transaction_throttle(trans, root);
out_notrans:
if (old_inode->i_ino == BTRFS_FIRST_FREE_OBJECTID) if (old_inode->i_ino == BTRFS_FIRST_FREE_OBJECTID)
up_read(&root->fs_info->subvol_sem); up_read(&root->fs_info->subvol_sem);