Commit 71008734 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: print the actual offset in btrfs_root_name 



We're supposed to print the root_key.offset in btrfs_root_name in the
case of a reloc root, not the objectid.  Fix this helper to take the key
so we have access to the offset when we need it.

Fixes: 457f1864 ("btrfs: pretty print leaked root name")
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a8cc263e

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1457,7 +1457,7 @@ void btrfs_check_leaked_roots(struct btrfs_fs_info *fs_info) 
		root = list_first_entry(&fs_info->allocated_roots,

					struct btrfs_root, leak_list);

		btrfs_err(fs_info, "leaked root %s refcount %d",

			  btrfs_root_name(root->root_key.objectid, buf),

			  btrfs_root_name(&root->root_key, buf),

			  refcount_read(&root->refs));

		while (refcount_read(&root->refs) > 1)

			btrfs_put_root(root);

fs/btrfs/print-tree.c

+5 −5
Original line number Diff line number Diff line
@@ -26,22 +26,22 @@ static const struct root_name_map root_map[] = { 
	{ BTRFS_DATA_RELOC_TREE_OBJECTID,	"DATA_RELOC_TREE"	},

};



const char *btrfs_root_name(u64 objectid, char *buf)

const char *btrfs_root_name(const struct btrfs_key *key, char *buf)

{

	int i;



	if (objectid == BTRFS_TREE_RELOC_OBJECTID) {

	if (key->objectid == BTRFS_TREE_RELOC_OBJECTID) {

		snprintf(buf, BTRFS_ROOT_NAME_BUF_LEN,

			 "TREE_RELOC offset=%llu", objectid);

			 "TREE_RELOC offset=%llu", key->offset);

		return buf;

	}



	for (i = 0; i < ARRAY_SIZE(root_map); i++) {

		if (root_map[i].id == objectid)

		if (root_map[i].id == key->objectid)

			return root_map[i].name;

	}



	snprintf(buf, BTRFS_ROOT_NAME_BUF_LEN, "%llu", objectid);

	snprintf(buf, BTRFS_ROOT_NAME_BUF_LEN, "%llu", key->objectid);

	return buf;

}

fs/btrfs/print-tree.h

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ 


void btrfs_print_leaf(struct extent_buffer *l);

void btrfs_print_tree(struct extent_buffer *c, bool follow);

const char *btrfs_root_name(u64 objectid, char *buf);

const char *btrfs_root_name(const struct btrfs_key *key, char *buf);



#endif