Btrfs: fix subvol_sem leak in btrfs_rename()
authorJohann Lombardi <johann@whamcloud.com>
Thu, 31 Mar 2011 13:23:47 +0000 (13:23 +0000)
committerChris Mason <chris.mason@oracle.com>
Tue, 5 Apr 2011 05:19:42 +0000 (01:19 -0400)
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>
fs/btrfs/inode.c

index 62ae9d5da806b54c07d9768f9a5a1925b8571927..1ca3e68586cf39e2a8d14d6157f1913fe954d458 100644 (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.
         */
        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);