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

btrfs: remove pointless key offset setup in create_pending_snapshot() 



There's no point in setting the key's offset to (u64)-1 since we never
use it before setting it to the current transaction's ID. So remove the
assignment of (u64)-1 to the key's offset and move the remainder of the
key initialization close to where it's used.

Reviewed-by: default avatarQu Wenruo <wqu@suse.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 db524fd9

fs/btrfs/transaction.c

+2 −4
Original line number Diff line number Diff line
@@ -1694,10 +1694,6 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 
			goto clear_skip_qgroup;

	}



	key.objectid = objectid;

	key.type = BTRFS_ROOT_ITEM_KEY;

	key.offset = (u64)-1;



	rsv = trans->block_rsv;

	trans->block_rsv = &pending->block_rsv;

	trans->bytes_reserved = trans->block_rsv->reserved;
@@ -1810,6 +1806,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 


	btrfs_set_root_node(new_root_item, tmp);

	/* record when the snapshot was created in key.offset */

	key.objectid = objectid;

	key.type = BTRFS_ROOT_ITEM_KEY;

	key.offset = trans->transid;

	ret = btrfs_insert_root(trans, tree_root, &key, new_root_item);

	btrfs_tree_unlock(tmp);