diff options
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 13 | 
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 85e072b956d..3d29d60bdaf 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -1336,7 +1336,6 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info,  	int page_num;  	u8 calculated_csum[BTRFS_CSUM_SIZE];  	u32 crc = ~(u32)0; -	struct btrfs_root *root = fs_info->extent_root;  	void *mapped_buffer;  	WARN_ON(!sblock->pagev[0]->page); @@ -1365,12 +1364,11 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info,  	for (page_num = 0;;) {  		if (page_num == 0 && is_metadata) -			crc = btrfs_csum_data(root, +			crc = btrfs_csum_data(  				((u8 *)mapped_buffer) + BTRFS_CSUM_SIZE,  				crc, PAGE_SIZE - BTRFS_CSUM_SIZE);  		else -			crc = btrfs_csum_data(root, mapped_buffer, crc, -					      PAGE_SIZE); +			crc = btrfs_csum_data(mapped_buffer, crc, PAGE_SIZE);  		kunmap_atomic(mapped_buffer);  		page_num++; @@ -1657,7 +1655,6 @@ static int scrub_checksum_data(struct scrub_block *sblock)  	void *buffer;  	u32 crc = ~(u32)0;  	int fail = 0; -	struct btrfs_root *root = sctx->dev_root;  	u64 len;  	int index; @@ -1674,7 +1671,7 @@ static int scrub_checksum_data(struct scrub_block *sblock)  	for (;;) {  		u64 l = min_t(u64, len, PAGE_SIZE); -		crc = btrfs_csum_data(root, buffer, crc, l); +		crc = btrfs_csum_data(buffer, crc, l);  		kunmap_atomic(buffer);  		len -= l;  		if (len == 0) @@ -1744,7 +1741,7 @@ static int scrub_checksum_tree_block(struct scrub_block *sblock)  	for (;;) {  		u64 l = min_t(u64, len, mapped_size); -		crc = btrfs_csum_data(root, p, crc, l); +		crc = btrfs_csum_data(p, crc, l);  		kunmap_atomic(mapped_buffer);  		len -= l;  		if (len == 0) @@ -1805,7 +1802,7 @@ static int scrub_checksum_super(struct scrub_block *sblock)  	for (;;) {  		u64 l = min_t(u64, len, mapped_size); -		crc = btrfs_csum_data(root, p, crc, l); +		crc = btrfs_csum_data(p, crc, l);  		kunmap_atomic(mapped_buffer);  		len -= l;  		if (len == 0)  |