btrfs: move btrfs_print_data_csum_error into inode.c

This isn't used outside of inode.c, there's no reason to define it in
btrfs_inode.h. Drop the inline and add __cold as it's for errors that
are not in any hot path.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@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 54c2ccb..530a0eb 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -410,30 +410,4 @@ static inline void btrfs_inode_split_flags(u64 inode_item_flags,
 /* Array of bytes with variable length, hexadecimal format 0x1234 */
 #define CSUM_FMT                               "0x%*phN"
 #define CSUM_FMT_VALUE(size, bytes)            size, bytes
-
-static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode,
-               u64 logical_start, u8 *csum, u8 *csum_expected, int mirror_num)
-{
-       struct btrfs_root *root = inode->root;
-       const u32 csum_size = root->fs_info->csum_size;
-
-       /* Output minus objectid, which is more meaningful */
-       if (root->root_key.objectid >= BTRFS_LAST_FREE_OBJECTID)
-               btrfs_warn_rl(root->fs_info,
-"csum failed root %lld ino %lld off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d",
-                       root->root_key.objectid, btrfs_ino(inode),
-                       logical_start,
-                       CSUM_FMT_VALUE(csum_size, csum),
-                       CSUM_FMT_VALUE(csum_size, csum_expected),
-                       mirror_num);
-       else
-               btrfs_warn_rl(root->fs_info,
-"csum failed root %llu ino %llu off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d",
-                       root->root_key.objectid, btrfs_ino(inode),
-                       logical_start,
-                       CSUM_FMT_VALUE(csum_size, csum),
-                       CSUM_FMT_VALUE(csum_size, csum_expected),
-                       mirror_num);
-}
-
 #endif

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 2ba2d8b..8cae730 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -125,6 +125,32 @@ static struct extent_map *create_io_em(struct btrfs_inode *inode, u64 start,
                                       u64 ram_bytes, int compress_type,
                                       int type);
 
+static void __cold btrfs_print_data_csum_error(struct btrfs_inode *inode,
+               u64 logical_start, u8 *csum, u8 *csum_expected, int mirror_num)
+{
+       struct btrfs_root *root = inode->root;
+       const u32 csum_size = root->fs_info->csum_size;
+
+       /* Output without objectid, which is more meaningful */
+       if (root->root_key.objectid >= BTRFS_LAST_FREE_OBJECTID) {
+               btrfs_warn_rl(root->fs_info,
+"csum failed root %lld ino %lld off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d",
+                       root->root_key.objectid, btrfs_ino(inode),
+                       logical_start,
+                       CSUM_FMT_VALUE(csum_size, csum),
+                       CSUM_FMT_VALUE(csum_size, csum_expected),
+                       mirror_num);
+       } else {
+               btrfs_warn_rl(root->fs_info,
+"csum failed root %llu ino %llu off %llu csum " CSUM_FMT " expected csum " CSUM_FMT " mirror %d",
+                       root->root_key.objectid, btrfs_ino(inode),
+                       logical_start,
+                       CSUM_FMT_VALUE(csum_size, csum),
+                       CSUM_FMT_VALUE(csum_size, csum_expected),
+                       mirror_num);
+       }
+}
+
 /*
  * btrfs_inode_lock - lock inode i_rwsem based on arguments passed
  *