Commit f366722f authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: avoid unnecessary path allocation when replaying a dir item 



There's no need to allocate 'fixup_path' at replay_one_dir_item(), as the
path passed as an argument is unused by the time link_to_fixup_dir() is
called (replay_one_name() releases the path before it returns).

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b343047c

fs/btrfs/tree-log.c

+1 −9
Original line number Diff line number Diff line
@@ -2147,18 +2147,10 @@ static noinline int replay_one_dir_item(struct walk_control *wc, 
	 * dentries that can never be deleted.

	 */

	if (ret == 1 && btrfs_dir_ftype(wc->log_leaf, di) != BTRFS_FT_DIR) {

		struct btrfs_path *fixup_path;

		struct btrfs_key di_key;



		fixup_path = btrfs_alloc_path();

		if (!fixup_path) {

			btrfs_abort_transaction(wc->trans, -ENOMEM);

			return -ENOMEM;

		}



		btrfs_dir_item_key_to_cpu(wc->log_leaf, di, &di_key);

		ret = link_to_fixup_dir(wc, fixup_path, di_key.objectid);

		btrfs_free_path(fixup_path);

		ret = link_to_fixup_dir(wc, path, di_key.objectid);

	}



	return ret;