]> git.ipfire.org Git - people/ms/linux.git/commitdiff
btrfs: free the path earlier when creating a new inode
authorFilipe Manana <fdmanana@suse.com>
Tue, 31 May 2022 15:06:33 +0000 (16:06 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 25 Jul 2022 15:44:35 +0000 (17:44 +0200)
When creating an inode, through btrfs_create_new_inode(), we release the
path we allocated before once we don't need it anymore. But we keep it
allocated until we return from that function, which is wasteful because
after we release the path we do several things that can allocate yet
another path: inheriting properties, setting the xattrs used by ACLs and
secutiry modules, adding an orphan item (O_TMPFILE case) or adding a
dir item (for the non-O_TMPFILE case).

So instead of releasing the path once we don't need it anymore, free it
instead. This way we avoid having two paths allocated until we return
from btrfs_create_new_inode().

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/inode.c

index 419bae723890cb686d0a4b649fde1920f1c843dd..7329a03292ebe890c54aa4fc85838d8ec3040f18 100644 (file)
@@ -6380,7 +6380,13 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,
        }
 
        btrfs_mark_buffer_dirty(path->nodes[0]);
-       btrfs_release_path(path);
+       /*
+        * We don't need the path anymore, plus inheriting properties, adding
+        * ACLs, security xattrs, orphan item or adding the link, will result in
+        * allocating yet another path. So just free our path.
+        */
+       btrfs_free_path(path);
+       path = NULL;
 
        if (args->subvol) {
                struct inode *parent;
@@ -6437,8 +6443,7 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans,
                goto discard;
        }
 
-       ret = 0;
-       goto out;
+       return 0;
 
 discard:
        /*