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

btrfs: pass bvec to csum_dirty_buffer instead of page 



Currently csum_dirty_buffer() uses page to grab extent buffer, but that
only works for sector size == PAGE_SIZE case.

For subpage we need page + page_offset to grab extent buffer.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
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 77bf40a2

fs/btrfs/disk-io.c

+6 −5
Original line number Diff line number Diff line
@@ -444,12 +444,13 @@ static int btree_read_extent_buffer_pages(struct extent_buffer *eb, 
}



/*

 * checksum a dirty tree block before IO.  This has extra checks to make sure

 * we only fill in the checksum field in the first page of a multi-page block

 * Checksum a dirty tree block before IO.  This has extra checks to make sure

 * we only fill in the checksum field in the first page of a multi-page block.

 * For subpage extent buffers we need bvec to also read the offset in the page.

 */



static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct page *page)

static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct bio_vec *bvec)

{

	struct page *page = bvec->bv_page;

	u64 start = page_offset(page);

	u64 found_start;

	u8 result[BTRFS_CSUM_SIZE];
@@ -791,7 +792,7 @@ static blk_status_t btree_csum_one_bio(struct bio *bio) 
	ASSERT(!bio_flagged(bio, BIO_CLONED));

	bio_for_each_segment_all(bvec, bio, iter_all) {

		root = BTRFS_I(bvec->bv_page->mapping->host)->root;

		ret = csum_dirty_buffer(root->fs_info, bvec->bv_page);

		ret = csum_dirty_buffer(root->fs_info, bvec);

		if (ret)

			break;

	}