btrfs: remove btrfs_csum_ptr

Commit Message

Johannes Thumshirn Feb. 10, 2023, 10:50 a.m. UTC

Remove btrfs_csum_ptr() and fold it into it's only caller.

Cc: Christoph Hellwig <[e-mail]>
Signed-off-by: Johannes Thumshirn <[e-mail]>
---
 fs/btrfs/inode.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Comments

Anand Jain Feb. 10, 2023, 3:45 p.m. UTC | #1

LGTM

Reviewed-by: Anand Jain <[e-mail]>

Christoph Hellwig Feb. 13, 2023, 6:32 a.m. UTC | #2

Looks good:

Reviewed-by: Christoph Hellwig <[e-mail]>

David Sterba Feb. 20, 2023, 7:31 p.m. UTC | #3

On Fri, Feb 10, 2023 at 02:50:08AM -0800, Johannes Thumshirn wrote:
> Remove btrfs_csum_ptr() and fold it into it's only caller.
> 
> Cc: Christoph Hellwig <[e-mail]>
> Signed-off-by: Johannes Thumshirn <[e-mail]>

Added to misc-next, thanks.

Patch

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 44e9acc77a74..d3e1f2712aa5 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3367,13 +3367,6 @@  int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,
 	return 0;
 }
 
-static u8 *btrfs_csum_ptr(const struct btrfs_fs_info *fs_info, u8 *csums, u64 offset)
-{
-	u64 offset_in_sectors = offset >> fs_info->sectorsize_bits;
-
-	return csums + offset_in_sectors * fs_info->csum_size;
-}
-
 /*
  * Verify the checksum of a single data sector.
  *
@@ -3411,7 +3404,8 @@  bool btrfs_data_csum_ok(struct btrfs_bio *bbio, struct btrfs_device *dev,
 		return true;
 	}
 
-	csum_expected = btrfs_csum_ptr(fs_info, bbio->csum, bio_offset);
+	csum_expected = bbio->csum + (bio_offset >> fs_info->sectorsize_bits) *
+				fs_info->csum_size;
 	if (btrfs_check_sector_csum(fs_info, bv->bv_page, bv->bv_offset, csum,
 				    csum_expected))
 		goto zeroit;