Commit 5cfe76f8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: rename the bytenr field in struct btrfs_ordered_sum to logical 



btrfs_ordered_sum::bytendr stores a logical address.  Make that clear by
renaming it to ->logical.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6e4b2479

fs/btrfs/file-item.c

+4 −4
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end, 
				goto fail;

			}



			sums->bytenr = start;

			sums->logical = start;

			sums->len = size;



			offset = bytes_to_csum_size(fs_info, start - key.offset);
@@ -749,7 +749,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio) 
	sums->len = bio->bi_iter.bi_size;

	INIT_LIST_HEAD(&sums->list);



	sums->bytenr = bio->bi_iter.bi_sector << SECTOR_SHIFT;

	sums->logical = bio->bi_iter.bi_sector << SECTOR_SHIFT;

	index = 0;



	shash->tfm = fs_info->csum_shash;
@@ -799,7 +799,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio) 
				ordered = btrfs_lookup_ordered_extent(inode,

								offset);

				ASSERT(ordered); /* Logic error */

				sums->bytenr = (bio->bi_iter.bi_sector << SECTOR_SHIFT)

				sums->logical = (bio->bi_iter.bi_sector << SECTOR_SHIFT)

					+ total_bytes;

				index = 0;

			}
@@ -1086,7 +1086,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, 
again:

	next_offset = (u64)-1;

	found_next = 0;

	bytenr = sums->bytenr + total_bytes;

	bytenr = sums->logical + total_bytes;

	file_key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;

	file_key.offset = bytenr;

	file_key.type = BTRFS_EXTENT_CSUM_KEY;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2850,7 +2850,7 @@ static int add_pending_csums(struct btrfs_trans_handle *trans, 
		trans->adding_csums = true;

		if (!csum_root)

			csum_root = btrfs_csum_root(trans->fs_info,

						    sum->bytenr);

						    sum->logical);

		ret = btrfs_csum_file_blocks(trans, csum_root, sum);

		trans->adding_csums = false;

		if (ret)

fs/btrfs/ordered-data.h

+4 −4
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ struct btrfs_ordered_inode_tree { 
};



struct btrfs_ordered_sum {

	/* bytenr is the start of this extent on disk */

	u64 bytenr;



	/*

	 * this is the length in bytes covered by the sums array below.

	 * Logical start address and length for of the blocks covered by

	 * the sums array.

	 */

	u64 logical;

	u32 len;



	struct list_head list;

	/* last field is a variable length array of csums */

	u8 sums[];

fs/btrfs/relocation.c

+2 −2
Original line number Diff line number Diff line
@@ -4379,8 +4379,8 @@ int btrfs_reloc_clone_csums(struct btrfs_inode *inode, u64 file_pos, u64 len) 
		 * disk_len vs real len like with real inodes since it's all

		 * disk length.

		 */

		new_bytenr = ordered->disk_bytenr + sums->bytenr - disk_bytenr;

		sums->bytenr = new_bytenr;

		new_bytenr = ordered->disk_bytenr + sums->logical - disk_bytenr;

		sums->logical = new_bytenr;



		btrfs_add_ordered_sum(ordered, sums);

	}

fs/btrfs/tree-log.c

+6 −6
Original line number Diff line number Diff line
@@ -859,10 +859,10 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, 
						struct btrfs_ordered_sum,

						list);

				csum_root = btrfs_csum_root(fs_info,

							    sums->bytenr);

							    sums->logical);

				if (!ret)

					ret = btrfs_del_csums(trans, csum_root,

							      sums->bytenr,

							      sums->logical,

							      sums->len);

				if (!ret)

					ret = btrfs_csum_file_blocks(trans,
@@ -4221,7 +4221,7 @@ static int log_csums(struct btrfs_trans_handle *trans, 
		     struct btrfs_root *log_root,

		     struct btrfs_ordered_sum *sums)

{

	const u64 lock_end = sums->bytenr + sums->len - 1;

	const u64 lock_end = sums->logical + sums->len - 1;

	struct extent_state *cached_state = NULL;

	int ret;
@@ -4239,7 +4239,7 @@ static int log_csums(struct btrfs_trans_handle *trans, 
	 * file which happens to refer to the same extent as well. Such races

	 * can leave checksum items in the log with overlapping ranges.

	 */

	ret = lock_extent(&log_root->log_csum_range, sums->bytenr, lock_end,

	ret = lock_extent(&log_root->log_csum_range, sums->logical, lock_end,

			  &cached_state);

	if (ret)

		return ret;
@@ -4252,11 +4252,11 @@ static int log_csums(struct btrfs_trans_handle *trans, 
	 * some checksums missing in the fs/subvolume tree. So just delete (or

	 * trim and adjust) any existing csum items in the log for this range.

	 */

	ret = btrfs_del_csums(trans, log_root, sums->bytenr, sums->len);

	ret = btrfs_del_csums(trans, log_root, sums->logical, sums->len);

	if (!ret)

		ret = btrfs_csum_file_blocks(trans, log_root, sums);



	unlock_extent(&log_root->log_csum_range, sums->bytenr, lock_end,

	unlock_extent(&log_root->log_csum_range, sums->logical, lock_end,

		      &cached_state);



	return ret;