Commit 47926ab5 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: rename btrfs_dio_private::logical_offset to file_offset 



The naming of "logical_offset" can be confused with logical bytenr of
the dio range.

In fact it's file offset, and the naming "file_offset" is already widely
used in all other sites.

Just do the rename to avoid confusion.

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3dcfbcce

fs/btrfs/btrfs_inode.h

+6 −1
Original line number Diff line number Diff line
@@ -356,7 +356,12 @@ static inline bool btrfs_inode_in_log(struct btrfs_inode *inode, u64 generation) 


struct btrfs_dio_private {

	struct inode *inode;

	u64 logical_offset;



	/*

	 * Since DIO can use anonymous page, we cannot use page_offset() to

	 * grab the file offset, thus need a dedicated member for file offset.

	 */

	u64 file_offset;

	u64 disk_bytenr;

	/* Used for bio::bi_size */

	u32 bytes;

fs/btrfs/inode.c

+6 −6
Original line number Diff line number Diff line
@@ -8055,13 +8055,13 @@ static void btrfs_dio_private_put(struct btrfs_dio_private *dip) 


	if (btrfs_op(dip->dio_bio) == BTRFS_MAP_WRITE) {

		__endio_write_update_ordered(BTRFS_I(dip->inode),

					     dip->logical_offset,

					     dip->file_offset,

					     dip->bytes,

					     !dip->dio_bio->bi_status);

	} else {

		unlock_extent(&BTRFS_I(dip->inode)->io_tree,

			      dip->logical_offset,

			      dip->logical_offset + dip->bytes - 1);

			      dip->file_offset,

			      dip->file_offset + dip->bytes - 1);

	}



	bio_endio(dip->dio_bio);
@@ -8176,7 +8176,7 @@ static void btrfs_end_dio_bio(struct bio *bio) 
	if (err)

		dip->dio_bio->bi_status = err;



	btrfs_record_physical_zoned(dip->inode, dip->logical_offset, bio);

	btrfs_record_physical_zoned(dip->inode, dip->file_offset, bio);



	bio_put(bio);

	btrfs_dio_private_put(dip);
@@ -8218,7 +8218,7 @@ static inline blk_status_t btrfs_submit_dio_bio(struct bio *bio, 
	} else {

		u64 csum_offset;



		csum_offset = file_offset - dip->logical_offset;

		csum_offset = file_offset - dip->file_offset;

		csum_offset >>= fs_info->sectorsize_bits;

		csum_offset *= fs_info->csum_size;

		btrfs_bio(bio)->csum = dip->csums + csum_offset;
@@ -8256,7 +8256,7 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio, 
		return NULL;



	dip->inode = inode;

	dip->logical_offset = file_offset;

	dip->file_offset = file_offset;

	dip->bytes = dio_bio->bi_iter.bi_size;

	dip->disk_bytenr = dio_bio->bi_iter.bi_sector << 9;

	dip->dio_bio = dio_bio;