Commit 12390e42 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: rename ->len to ->num_bytes in btrfs_ref 



We consistently use ->num_bytes everywhere through the delayed ref code,
except in btrfs_ref.  Rename btrfs_ref to match all the other code.

Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f75464f7

fs/btrfs/delayed-ref.c

+4 −4
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ static void init_delayed_ref_head(struct btrfs_delayed_ref_head *head_ref, 


	refcount_set(&head_ref->refs, 1);

	head_ref->bytenr = generic_ref->bytenr;

	head_ref->num_bytes = generic_ref->len;

	head_ref->num_bytes = generic_ref->num_bytes;

	head_ref->ref_mod = count_mod;

	head_ref->reserved_bytes = reserved;

	head_ref->must_insert_reserved = must_insert_reserved;
@@ -895,7 +895,7 @@ static void init_delayed_ref_head(struct btrfs_delayed_ref_head *head_ref, 
			qrecord->data_rsv_refroot = generic_ref->ref_root;

		}

		qrecord->bytenr = generic_ref->bytenr;

		qrecord->num_bytes = generic_ref->len;

		qrecord->num_bytes = generic_ref->num_bytes;

		qrecord->old_roots = NULL;

	}

}
@@ -1000,7 +1000,7 @@ static void init_delayed_ref_common(struct btrfs_fs_info *fs_info, 


	refcount_set(&ref->refs, 1);

	ref->bytenr = generic_ref->bytenr;

	ref->num_bytes = generic_ref->len;

	ref->num_bytes = generic_ref->num_bytes;

	ref->ref_mod = 1;

	ref->action = action;

	ref->seq = seq;
@@ -1155,7 +1155,7 @@ int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans, 
		.type = BTRFS_REF_METADATA,

		.action = BTRFS_UPDATE_DELAYED_HEAD,

		.bytenr = bytenr,

		.len = num_bytes,

		.num_bytes = num_bytes,

	};



	head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);

fs/btrfs/delayed-ref.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ struct btrfs_ref { 
	u64 real_root;

#endif

	u64 bytenr;

	u64 len;

	u64 num_bytes;

	u64 owning_root;



	/*

fs/btrfs/extent-tree.c

+7 −7
Original line number Diff line number Diff line
@@ -2542,7 +2542,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, 
			if (ref.bytenr == 0)

				continue;



			ref.len = btrfs_file_extent_disk_num_bytes(buf, fi);

			ref.num_bytes = btrfs_file_extent_disk_num_bytes(buf, fi);

			ref.owning_root = ref_root;



			key.offset -= btrfs_file_extent_offset(buf, fi);
@@ -2557,7 +2557,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, 
		} else {

			/* We don't know the owning_root, leave as 0. */

			ref.bytenr = btrfs_node_blockptr(buf, i);

			ref.len = fs_info->nodesize;

			ref.num_bytes = fs_info->nodesize;



			btrfs_init_tree_ref(&ref, level - 1,

					    root->root_key.objectid, for_reloc);
@@ -3466,7 +3466,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, 
		struct btrfs_ref generic_ref = {

			.action = BTRFS_DROP_DELAYED_REF,

			.bytenr = buf->start,

			.len = buf->len,

			.num_bytes = buf->len,

			.parent = parent,

			.owning_root = btrfs_header_owner(buf),

			.ref_root = root_id,
@@ -3560,7 +3560,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref) 
	 * tree, just update pinning info and exit early.

	 */

	if (ref->ref_root == BTRFS_TREE_LOG_OBJECTID) {

		btrfs_pin_extent(trans, ref->bytenr, ref->len, 1);

		btrfs_pin_extent(trans, ref->bytenr, ref->num_bytes, 1);

		ret = 0;

	} else if (ref->type == BTRFS_REF_METADATA) {

		ret = btrfs_add_delayed_tree_ref(trans, ref, NULL);
@@ -4967,7 +4967,7 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
	struct btrfs_ref generic_ref = {

		.action = BTRFS_ADD_DELAYED_EXTENT,

		.bytenr = ins->objectid,

		.len = ins->offset,

		.num_bytes = ins->offset,

		.owning_root = root->root_key.objectid,

		.ref_root = root->root_key.objectid,

	};
@@ -5201,7 +5201,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, 
		struct btrfs_ref generic_ref = {

			.action = BTRFS_ADD_DELAYED_EXTENT,

			.bytenr = ins.objectid,

			.len = ins.offset,

			.num_bytes = ins.offset,

			.parent = parent,

			.owning_root = owning_root,

			.ref_root = root_objectid,
@@ -5586,7 +5586,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 
		struct btrfs_ref ref = {

			.action = BTRFS_DROP_DELAYED_REF,

			.bytenr = bytenr,

			.len = fs_info->nodesize,

			.num_bytes = fs_info->nodesize,

			.owning_root = owner_root,

			.ref_root = root->root_key.objectid,

		};

fs/btrfs/file.c

+5 −5
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans, 
				struct btrfs_ref ref = {

					.action = BTRFS_ADD_DELAYED_REF,

					.bytenr = disk_bytenr,

					.len = num_bytes,

					.num_bytes = num_bytes,

					.parent = 0,

					.owning_root = root->root_key.objectid,

					.ref_root = root->root_key.objectid,
@@ -468,7 +468,7 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans, 
				struct btrfs_ref ref = {

					.action = BTRFS_DROP_DELAYED_REF,

					.bytenr = disk_bytenr,

					.len = num_bytes,

					.num_bytes = num_bytes,

					.parent = 0,

					.owning_root = root->root_key.objectid,

					.ref_root = root->root_key.objectid,
@@ -753,7 +753,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans, 


		ref.action = BTRFS_ADD_DELAYED_REF;

		ref.bytenr = bytenr;

		ref.len = num_bytes;

		ref.num_bytes = num_bytes;

		ref.parent = 0;

		ref.owning_root = root->root_key.objectid;

		ref.ref_root = root->root_key.objectid;
@@ -783,7 +783,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans, 


	ref.action = BTRFS_DROP_DELAYED_REF;

	ref.bytenr = bytenr;

	ref.len = num_bytes;

	ref.num_bytes = num_bytes;

	ref.parent = 0;

	ref.owning_root = root->root_key.objectid;

	ref.ref_root = root->root_key.objectid;
@@ -2492,7 +2492,7 @@ static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans, 
		struct btrfs_ref ref = {

			.action = BTRFS_ADD_DELAYED_REF,

			.bytenr = extent_info->disk_offset,

			.len = extent_info->disk_len,

			.num_bytes = extent_info->disk_len,

			.owning_root = root->root_key.objectid,

			.ref_root = root->root_key.objectid,

		};

fs/btrfs/inode-item.c

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
			struct btrfs_ref ref = {

				.action = BTRFS_DROP_DELAYED_REF,

				.bytenr = extent_start,

				.len = extent_num_bytes,

				.num_bytes = extent_num_bytes,

				.owning_root = root->root_key.objectid,

				.ref_root = btrfs_header_owner(leaf),

			};