Commit 6c75a589 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba

btrfs: print-tree: pass const extent buffer pointer

Since print-tree infrastructure only prints the content of a tree block,
we can make them to accept const extent buffer pointer.

This removes a forced type convert in extent-tree, where we convert a
const extent buffer pointer to regular one, just to avoid compiler
warning.
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b5345d6c
...@@ -3077,7 +3077,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans, ...@@ -3077,7 +3077,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
* and nr indicate which items in the leaf to check. This totals up the * and nr indicate which items in the leaf to check. This totals up the
* space used both by the item structs and the item data * space used both by the item structs and the item data
*/ */
static int leaf_space_used(struct extent_buffer *l, int start, int nr) static int leaf_space_used(const struct extent_buffer *l, int start, int nr)
{ {
int data_len; int data_len;
int nritems = btrfs_header_nritems(l); int nritems = btrfs_header_nritems(l);
...@@ -3097,7 +3097,7 @@ static int leaf_space_used(struct extent_buffer *l, int start, int nr) ...@@ -3097,7 +3097,7 @@ static int leaf_space_used(struct extent_buffer *l, int start, int nr)
* the start of the leaf data. IOW, how much room * the start of the leaf data. IOW, how much room
* the leaf has left for both items and data * the leaf has left for both items and data
*/ */
noinline int btrfs_leaf_free_space(struct extent_buffer *leaf) int btrfs_leaf_free_space(const struct extent_buffer *leaf)
{ {
struct btrfs_fs_info *fs_info = leaf->fs_info; struct btrfs_fs_info *fs_info = leaf->fs_info;
int nritems = btrfs_header_nritems(leaf); int nritems = btrfs_header_nritems(leaf);
......
...@@ -685,7 +685,7 @@ static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p) ...@@ -685,7 +685,7 @@ static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p)
{ {
return btrfs_next_old_item(root, p, 0); return btrfs_next_old_item(root, p, 0);
} }
int btrfs_leaf_free_space(struct extent_buffer *leaf); int btrfs_leaf_free_space(const struct extent_buffer *leaf);
static inline int is_fstree(u64 rootid) static inline int is_fstree(u64 rootid)
{ {
......
...@@ -402,7 +402,7 @@ int btrfs_get_extent_inline_ref_type(const struct extent_buffer *eb, ...@@ -402,7 +402,7 @@ int btrfs_get_extent_inline_ref_type(const struct extent_buffer *eb,
} }
} }
btrfs_print_leaf((struct extent_buffer *)eb); btrfs_print_leaf(eb);
btrfs_err(eb->fs_info, btrfs_err(eb->fs_info,
"eb %llu iref 0x%lx invalid extent inline ref type %d", "eb %llu iref 0x%lx invalid extent inline ref type %d",
eb->start, (unsigned long)iref, type); eb->start, (unsigned long)iref, type);
......
...@@ -49,7 +49,7 @@ const char *btrfs_root_name(const struct btrfs_key *key, char *buf) ...@@ -49,7 +49,7 @@ const char *btrfs_root_name(const struct btrfs_key *key, char *buf)
return buf; return buf;
} }
static void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk) static void print_chunk(const struct extent_buffer *eb, struct btrfs_chunk *chunk)
{ {
int num_stripes = btrfs_chunk_num_stripes(eb, chunk); int num_stripes = btrfs_chunk_num_stripes(eb, chunk);
int i; int i;
...@@ -62,7 +62,7 @@ static void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk) ...@@ -62,7 +62,7 @@ static void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
btrfs_stripe_offset_nr(eb, chunk, i)); btrfs_stripe_offset_nr(eb, chunk, i));
} }
} }
static void print_dev_item(struct extent_buffer *eb, static void print_dev_item(const struct extent_buffer *eb,
struct btrfs_dev_item *dev_item) struct btrfs_dev_item *dev_item)
{ {
pr_info("\t\tdev item devid %llu total_bytes %llu bytes used %llu\n", pr_info("\t\tdev item devid %llu total_bytes %llu bytes used %llu\n",
...@@ -70,7 +70,7 @@ static void print_dev_item(struct extent_buffer *eb, ...@@ -70,7 +70,7 @@ static void print_dev_item(struct extent_buffer *eb,
btrfs_device_total_bytes(eb, dev_item), btrfs_device_total_bytes(eb, dev_item),
btrfs_device_bytes_used(eb, dev_item)); btrfs_device_bytes_used(eb, dev_item));
} }
static void print_extent_data_ref(struct extent_buffer *eb, static void print_extent_data_ref(const struct extent_buffer *eb,
struct btrfs_extent_data_ref *ref) struct btrfs_extent_data_ref *ref)
{ {
pr_cont("extent data backref root %llu objectid %llu offset %llu count %u\n", pr_cont("extent data backref root %llu objectid %llu offset %llu count %u\n",
...@@ -80,7 +80,7 @@ static void print_extent_data_ref(struct extent_buffer *eb, ...@@ -80,7 +80,7 @@ static void print_extent_data_ref(struct extent_buffer *eb,
btrfs_extent_data_ref_count(eb, ref)); btrfs_extent_data_ref_count(eb, ref));
} }
static void print_extent_item(struct extent_buffer *eb, int slot, int type) static void print_extent_item(const struct extent_buffer *eb, int slot, int type)
{ {
struct btrfs_extent_item *ei; struct btrfs_extent_item *ei;
struct btrfs_extent_inline_ref *iref; struct btrfs_extent_inline_ref *iref;
...@@ -169,7 +169,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type) ...@@ -169,7 +169,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
WARN_ON(ptr > end); WARN_ON(ptr > end);
} }
static void print_uuid_item(struct extent_buffer *l, unsigned long offset, static void print_uuid_item(const struct extent_buffer *l, unsigned long offset,
u32 item_size) u32 item_size)
{ {
if (!IS_ALIGNED(item_size, sizeof(u64))) { if (!IS_ALIGNED(item_size, sizeof(u64))) {
...@@ -191,7 +191,7 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset, ...@@ -191,7 +191,7 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset,
* Helper to output refs and locking status of extent buffer. Useful to debug * Helper to output refs and locking status of extent buffer. Useful to debug
* race condition related problems. * race condition related problems.
*/ */
static void print_eb_refs_lock(struct extent_buffer *eb) static void print_eb_refs_lock(const struct extent_buffer *eb)
{ {
#ifdef CONFIG_BTRFS_DEBUG #ifdef CONFIG_BTRFS_DEBUG
btrfs_info(eb->fs_info, "refs %u lock_owner %u current %u", btrfs_info(eb->fs_info, "refs %u lock_owner %u current %u",
...@@ -199,7 +199,7 @@ static void print_eb_refs_lock(struct extent_buffer *eb) ...@@ -199,7 +199,7 @@ static void print_eb_refs_lock(struct extent_buffer *eb)
#endif #endif
} }
void btrfs_print_leaf(struct extent_buffer *l) void btrfs_print_leaf(const struct extent_buffer *l)
{ {
struct btrfs_fs_info *fs_info; struct btrfs_fs_info *fs_info;
int i; int i;
...@@ -355,7 +355,7 @@ void btrfs_print_leaf(struct extent_buffer *l) ...@@ -355,7 +355,7 @@ void btrfs_print_leaf(struct extent_buffer *l)
} }
} }
void btrfs_print_tree(struct extent_buffer *c, bool follow) void btrfs_print_tree(const struct extent_buffer *c, bool follow)
{ {
struct btrfs_fs_info *fs_info; struct btrfs_fs_info *fs_info;
int i; u32 nr; int i; u32 nr;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
/* Buffer size to contain tree name and possibly additional data (offset) */ /* Buffer size to contain tree name and possibly additional data (offset) */
#define BTRFS_ROOT_NAME_BUF_LEN 48 #define BTRFS_ROOT_NAME_BUF_LEN 48
void btrfs_print_leaf(struct extent_buffer *l); void btrfs_print_leaf(const struct extent_buffer *l);
void btrfs_print_tree(struct extent_buffer *c, bool follow); void btrfs_print_tree(const struct extent_buffer *c, bool follow);
const char *btrfs_root_name(const struct btrfs_key *key, char *buf); const char *btrfs_root_name(const struct btrfs_key *key, char *buf);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment