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

btrfs: remove unnecessary inode key in btrfs_log_all_parents() 



We are setting up an inode key to lookup parent directory inode but all we
need is the inode's objectid. The use of the key was necessary in the past
but since commit 0202e83f ("btrfs: simplify iget helpers") we only
need the objectid.

So remove the key variable in the stack and use instead a simple u64 for
the inode's objectid.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
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 1c3e03b3

fs/btrfs/tree-log.c

+4 −8
Original line number Diff line number Diff line
@@ -7201,28 +7201,24 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans, 
		item_size = btrfs_item_size(leaf, slot);

		ptr = btrfs_item_ptr_offset(leaf, slot);

		while (cur_offset < item_size) {

			struct btrfs_key inode_key;

			u64 dir_id;

			struct btrfs_inode *dir_inode;



			inode_key.type = BTRFS_INODE_ITEM_KEY;

			inode_key.offset = 0;



			if (key.type == BTRFS_INODE_EXTREF_KEY) {

				struct btrfs_inode_extref *extref;



				extref = (struct btrfs_inode_extref *)

					(ptr + cur_offset);

				inode_key.objectid = btrfs_inode_extref_parent(

					leaf, extref);

				dir_id = btrfs_inode_extref_parent(leaf, extref);

				cur_offset += sizeof(*extref);

				cur_offset += btrfs_inode_extref_name_len(leaf,

					extref);

			} else {

				inode_key.objectid = key.offset;

				dir_id = key.offset;

				cur_offset = item_size;

			}



			dir_inode = btrfs_iget_logging(inode_key.objectid, root);

			dir_inode = btrfs_iget_logging(dir_id, root);

			/*

			 * If the parent inode was deleted, return an error to

			 * fallback to a transaction commit. This is to prevent