| Message ID | 20170207065717.6671-1-quwenruo@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Tue, Feb 07, 2017 at 02:57:17PM +0800, Qu Wenruo wrote: > The original csum error message only outputs inode number, offset, check > sum and expected check sum. > > However no root objectid is outputted, which sometimes makes debugging > quite painful under multi-subvolume case (including relocation). > > Also the checksum output is decimal, which seldom makes sense for > users/developers and is hard to read in most time. > > This patch will add root objectid, which will be %lld for rootid larger > than LAST_FREE_OBJECTID, and hex csum output for better readability. Ok for the change. > + "csum failed root %lld ino %lld off %llu csum 0x%08x expected csum 0x%08x", > + "csum failed root %llu ino %llu off %llu csum 0x%08x expected csum 0x%08x", > - "csum failed ino %llu extent %llu csum %u wanted %u mirror %d", so the new code does not print mirror number, I think this still makes sense in cases where we know it. Please extend the helper and callchain that leads to the new print functions so we see the mirror as well. btrfs_readpage_end_io_hook __readpage_endio_check (print the csum failed message) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 1a8fa46ff87e..d797f1eab5aa 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -326,6 +326,24 @@ static inline void btrfs_inode_resume_unlocked_dio(struct inode *inode) &BTRFS_I(inode)->runtime_flags); } +static inline void btrfs_print_data_csum_error(struct inode *inode, + u64 logical_start, u32 csum, u32 csum_expected) +{ + struct btrfs_root *root = BTRFS_I(inode)->root; + + /* Output minus objectid, which is more meaningful */ + if (root->objectid >= BTRFS_LAST_FREE_OBJECTID) + btrfs_warn_rl(root->fs_info, + "csum failed root %lld ino %lld off %llu csum 0x%08x expected csum 0x%08x", + root->objectid, btrfs_ino(inode), logical_start, csum, + csum_expected); + else + btrfs_warn_rl(root->fs_info, + "csum failed root %llu ino %llu off %llu csum 0x%08x expected csum 0x%08x", + root->objectid, btrfs_ino(inode), logical_start, csum, + csum_expected); +} + bool btrfs_page_exists_in_range(struct inode *inode, loff_t start, loff_t end); #endif diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 7f390849343b..06122e218326 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -124,10 +124,8 @@ static int check_compressed_csum(struct inode *inode, kunmap_atomic(kaddr); if (csum != *cb_sum) { - btrfs_info(BTRFS_I(inode)->root->fs_info, - "csum failed ino %llu extent %llu csum %u wanted %u mirror %d", - btrfs_ino(inode), disk_start, csum, *cb_sum, - cb->mirror_num); + btrfs_print_data_csum_error(inode, disk_start, csum, + *cb_sum); ret = -EIO; goto fail; } diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1e861a063721..7cd0c1424e8d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3123,9 +3123,7 @@ static int __readpage_endio_check(struct inode *inode, kunmap_atomic(kaddr); return 0; zeroit: - btrfs_warn_rl(BTRFS_I(inode)->root->fs_info, - "csum failed ino %llu off %llu csum %u expected csum %u", - btrfs_ino(inode), start, csum, csum_expected); + btrfs_print_data_csum_error(inode, start, csum, csum_expected); memset(kaddr + pgoff, 1, len); flush_dcache_page(page); kunmap_atomic(kaddr);
The original csum error message only outputs inode number, offset, check sum and expected check sum. However no root objectid is outputted, which sometimes makes debugging quite painful under multi-subvolume case (including relocation). Also the checksum output is decimal, which seldom makes sense for users/developers and is hard to read in most time. This patch will add root objectid, which will be %lld for rootid larger than LAST_FREE_OBJECTID, and hex csum output for better readability. Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> --- v2: Delete the unnecessary warning output in fs/btrfs/inode.c --- fs/btrfs/btrfs_inode.h | 18 ++++++++++++++++++ fs/btrfs/compression.c | 6 ++---- fs/btrfs/inode.c | 4 +--- 3 files changed, 21 insertions(+), 7 deletions(-)