Btrfs: release subvolume's block_rsv before transaction commit

We don't have to keep subvolume's block_rsv during transaction commit,
and within transaction commit, we may also need the free space reclaimed
from this block_rsv to process delayed refs.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 3970f32b2b80..332b624e25db 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -436,7 +436,9 @@ static noinline int create_subvol(struct inode *dir,
         trans = btrfs_start_transaction(root, 0);
         if (IS_ERR(trans)) {
                 ret = PTR_ERR(trans);
-                goto out;
+                btrfs_subvolume_release_metadata(root, &block_rsv,
+                                                 qgroup_reserved);
+                return ret;
         }
         trans->block_rsv = &block_rsv;
         trans->bytes_reserved = block_rsv.size;
@@ -561,6 +563,8 @@ static noinline int create_subvol(struct inode *dir,
 fail:
         trans->block_rsv = NULL;
         trans->bytes_reserved = 0;
+        btrfs_subvolume_release_metadata(root, &block_rsv, qgroup_reserved);
+
         if (async_transid) {
                 *async_transid = trans->transid;
                 err = btrfs_commit_transaction_async(trans, root, 1);
@@ -574,14 +578,10 @@ fail:
 
         if (!ret) {
                 inode = btrfs_lookup_dentry(dir, dentry);
-                if (IS_ERR(inode)) {
-                        ret = PTR_ERR(inode);
-                        goto out;
-                }
+                if (IS_ERR(inode))
+                        return PTR_ERR(inode);
                 d_instantiate(dentry, inode);
         }
-out:
-        btrfs_subvolume_release_metadata(root, &block_rsv, qgroup_reserved);
         return ret;
 }