btrfs: make btrfs_print_data_csum_error take btrfs_inode

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 36eca5464e1b3b733287c7a24cc9c679bba7ca9f..c10d21b2f0df6f8722ddb198835568c41b62cc3a 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -324,21 +324,21 @@ 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,
+static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode,
                u64 logical_start, u32 csum, u32 csum_expected, int mirror_num)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_root *root = 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 mirror %d",
-                       root->objectid, btrfs_ino(BTRFS_I(inode)),
+                       root->objectid, btrfs_ino(inode),
                        logical_start, csum, csum_expected, mirror_num);
        else
                btrfs_warn_rl(root->fs_info,
        "csum failed root %llu ino %llu off %llu csum 0x%08x expected csum 0x%08x mirror %d",
-                       root->objectid, btrfs_ino(BTRFS_I(inode)),
+                       root->objectid, btrfs_ino(inode),
                        logical_start, csum, csum_expected, mirror_num);
 }
 

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 903c32c9eb22214f10d6dbdadb64f6b698e2bf66..9ce85d5e5cae768cc35373184ff2e25e158844ed 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -124,8 +124,9 @@ static int check_compressed_csum(struct inode *inode,
                kunmap_atomic(kaddr);
 
                if (csum != *cb_sum) {
-                       btrfs_print_data_csum_error(inode, disk_start, csum,
-                                                   *cb_sum, cb->mirror_num);
+                       btrfs_print_data_csum_error(BTRFS_I(inode),
+                                       disk_start, csum,
+                                       *cb_sum, cb->mirror_num);
                        ret = -EIO;
                        goto fail;
                }

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index f1f9e201f9f3273c3cbdb051f4d50261e353263f..fc00117a0dd0661d6815a9fcc97ccf1dcc2f4213 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3032,7 +3032,7 @@ static int __readpage_endio_check(struct inode *inode,
        kunmap_atomic(kaddr);
        return 0;
 zeroit:
-       btrfs_print_data_csum_error(inode, start, csum, csum_expected,
+       btrfs_print_data_csum_error(BTRFS_I(inode), start, csum, csum_expected,
                                    io_bio->mirror_num);
        memset(kaddr + pgoff, 1, len);
        flush_dcache_page(page);