hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: increment corrupt device counter during compressed read 

If a compressed read fails due to checksum error only a line is printed
to dmesg, device corrupt counter is not modified.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2020-07-02 15:23:34 +03:00 committed by David Sterba
parent 26056eab4b
commit 5a9472fe7f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/compression.c
View File

@ -172,8 +172,7 @@ static inline int compressed_bio_size(struct btrfs_fs_info *fs_info,
(DIV_ROUND_UP(disk_size, fs_info->sectorsize)) * csum_size; (DIV_ROUND_UP(disk_size, fs_info->sectorsize)) * csum_size;
} }
static int check_compressed_csum(struct btrfs_inode *inode, static int check_compressed_csum(struct btrfs_inode *inode, struct bio *bio,
struct compressed_bio *cb,
u64 disk_start) u64 disk_start)
{ {
struct btrfs_fs_info *fs_info = inode->root->fs_info; struct btrfs_fs_info *fs_info = inode->root->fs_info;
@ -184,6 +183,7 @@ static int check_compressed_csum(struct btrfs_inode *inode,
unsigned long i; unsigned long i;
char *kaddr; char *kaddr;
u8 csum[BTRFS_CSUM_SIZE]; u8 csum[BTRFS_CSUM_SIZE];
struct compressed_bio *cb = bio->bi_private;
u8 *cb_sum = cb->sums; u8 *cb_sum = cb->sums;
if (inode->flags & BTRFS_INODE_NODATASUM) if (inode->flags & BTRFS_INODE_NODATASUM)
@ -201,6 +201,10 @@ static int check_compressed_csum(struct btrfs_inode *inode,
if (memcmp(&csum, cb_sum, csum_size)) { if (memcmp(&csum, cb_sum, csum_size)) {
btrfs_print_data_csum_error(inode, disk_start, btrfs_print_data_csum_error(inode, disk_start,
csum, cb_sum, cb->mirror_num); csum, cb_sum, cb->mirror_num);
if (btrfs_io_bio(bio)->device)
btrfs_dev_stat_inc_and_print(
btrfs_io_bio(bio)->device,
BTRFS_DEV_STAT_CORRUPTION_ERRS);
ret = -EIO; ret = -EIO;
goto fail; goto fail;
} }
@ -255,7 +259,7 @@ static void end_compressed_bio_read(struct bio *bio)
goto csum_failed; goto csum_failed;
inode = cb->inode; inode = cb->inode;
ret = check_compressed_csum(BTRFS_I(inode), cb, ret = check_compressed_csum(BTRFS_I(inode), bio,
(u64)bio->bi_iter.bi_sector << 9); (u64)bio->bi_iter.bi_sector << 9);
if (ret) if (ret)
goto csum_failed; goto csum_failed;