mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: remove the start argument to check_data_csum and export

Browse source 
Derive the value of start from the btrfs_bio now that ->file_offset is
always valid.  Also export and rename the function so it's available
outside of inode.c as we'll need that soon.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Boris Burkov <boris@bur.io>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Christoph Hellwig 2022-07-07 07:33:29 +02:00 committed by David Sterba
parent 7aa51232e2
commit 7959bd4411
2 changed files with 13 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
fs/btrfs/ctree.h
View file

@ -3296,6 +3296,8 @@ int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,
unsigned int btrfs_verify_data_csum(struct btrfs_bio *bbio, unsigned int btrfs_verify_data_csum(struct btrfs_bio *bbio,
u32 bio_offset, struct page *page, u32 bio_offset, struct page *page,
u64 start, u64 end); u64 start, u64 end);
int btrfs_check_data_csum(struct inode *inode, struct btrfs_bio *bbio,
u32 bio_offset, struct page *page, u32 pgoff);
struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode, struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,
u64 start, u64 len); u64 start, u64 len);
noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,

26
fs/btrfs/inode.c
View file

@ -3440,20 +3440,18 @@ int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,
/* /*
* check_data_csum - verify checksum of one sector of uncompressed data * check_data_csum - verify checksum of one sector of uncompressed data
* @inode: inode * @inode: inode
* @io_bio: btrfs_io_bio which contains the csum * @bbio: btrfs_bio which contains the csum
* @bio_offset: offset to the beginning of the bio (in bytes) * @bio_offset: offset to the beginning of the bio (in bytes)
* @page: page where is the data to be verified * @page: page where is the data to be verified
* @pgoff: offset inside the page * @pgoff: offset inside the page
* @start: logical offset in the file
* *
* The length of such check is always one sector size. * The length of such check is always one sector size.
* *
* When csum mismatch is detected, we will also report the error and fill the * When csum mismatch is detected, we will also report the error and fill the
* corrupted range with zero. (Thus it needs the extra parameters) * corrupted range with zero. (Thus it needs the extra parameters)
*/ */
static int check_data_csum(struct inode *inode, struct btrfs_bio *bbio, int btrfs_check_data_csum(struct inode *inode, struct btrfs_bio *bbio,
u32 bio_offset, struct page *page, u32 pgoff, u32 bio_offset, struct page *page, u32 pgoff)
u64 start)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
u32 len = fs_info->sectorsize; u32 len = fs_info->sectorsize;
@ -3469,8 +3467,9 @@ static int check_data_csum(struct inode *inode, struct btrfs_bio *bbio,
return 0; return 0;
zeroit: zeroit:
btrfs_print_data_csum_error(BTRFS_I(inode), start, csum, csum_expected, btrfs_print_data_csum_error(BTRFS_I(inode),
bbio->mirror_num); bbio->file_offset + bio_offset,
csum, csum_expected, bbio->mirror_num);
if (bbio->device) if (bbio->device)
btrfs_dev_stat_inc_and_print(bbio->device, btrfs_dev_stat_inc_and_print(bbio->device,
BTRFS_DEV_STAT_CORRUPTION_ERRS); BTRFS_DEV_STAT_CORRUPTION_ERRS);
@ -3539,8 +3538,7 @@ unsigned int btrfs_verify_data_csum(struct btrfs_bio *bbio,
EXTENT_NODATASUM); EXTENT_NODATASUM);
continue; continue;
} }
ret = check_data_csum(inode, bbio, bio_offset, page, pg_off, ret = btrfs_check_data_csum(inode, bbio, bio_offset, page, pg_off);
page_offset(page) + pg_off);
if (ret < 0) { if (ret < 0) {
const int nr_bit = (pg_off - offset_in_page(start)) >> const int nr_bit = (pg_off - offset_in_page(start)) >>
root->fs_info->sectorsize_bits; root->fs_info->sectorsize_bits;
@ -8004,8 +8002,8 @@ static blk_status_t btrfs_check_read_dio_bio(struct btrfs_dio_private *dip,
u64 start = bbio->file_offset + offset; u64 start = bbio->file_offset + offset;
if (uptodate && if (uptodate &&
(!csum || !check_data_csum(inode, bbio, offset, bv.bv_page, (!csum || !btrfs_check_data_csum(inode, bbio, offset, bv.bv_page,
bv.bv_offset, start))) { bv.bv_offset))) {
clean_io_failure(fs_info, failure_tree, io_tree, start, clean_io_failure(fs_info, failure_tree, io_tree, start,
bv.bv_page, btrfs_ino(BTRFS_I(inode)), bv.bv_page, btrfs_ino(BTRFS_I(inode)),
bv.bv_offset); bv.bv_offset);
@ -10387,7 +10385,6 @@ static blk_status_t btrfs_encoded_read_verify_csum(struct btrfs_bio *bbio)
u32 sectorsize = fs_info->sectorsize; u32 sectorsize = fs_info->sectorsize;
struct bio_vec *bvec; struct bio_vec *bvec;
struct bvec_iter_all iter_all; struct bvec_iter_all iter_all;
u64 start = priv->file_offset;
u32 bio_offset = 0; u32 bio_offset = 0;
if (priv->skip_csum || !uptodate) if (priv->skip_csum || !uptodate)
@ -10400,10 +10397,9 @@ static blk_status_t btrfs_encoded_read_verify_csum(struct btrfs_bio *bbio)
pgoff = bvec->bv_offset; pgoff = bvec->bv_offset;
for (i = 0; i < nr_sectors; i++) { for (i = 0; i < nr_sectors; i++) {
ASSERT(pgoff < PAGE_SIZE); ASSERT(pgoff < PAGE_SIZE);
if (check_data_csum(&inode->vfs_inode, bbio, bio_offset, if (btrfs_check_data_csum(&inode->vfs_inode, bbio, bio_offset,
bvec->bv_page, pgoff, start)) bvec->bv_page, pgoff))
return BLK_STS_IOERR; return BLK_STS_IOERR;
start += sectorsize;
bio_offset += sectorsize; bio_offset += sectorsize;
pgoff += sectorsize; pgoff += sectorsize;
} }