Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab8d0fc4 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

btrfs: convert pr_* to btrfs_* where possible 



For many printks, we want to know which file system issued the message.

This patch converts most pr_* calls to use the btrfs_* versions instead.
In some cases, this means adding plumbing to allow call sites access to
an fs_info pointer.

fs/btrfs/check-integrity.c is left alone for another day.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 62e85577

fs/btrfs/backref.c

+27 −16
Original line number Original line Diff line number Diff line
@@ -650,7 +650,8 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, 
	/* root node has been locked, we can release @subvol_srcu safely here */

	/* root node has been locked, we can release @subvol_srcu safely here */

	srcu_read_unlock(&fs_info->subvol_srcu, index);

	srcu_read_unlock(&fs_info->subvol_srcu, index);





	pr_debug("search slot in root %llu (level %d, ref count %d) returned %d for key (%llu %u %llu)\n",

	btrfs_debug(fs_info,

		"search slot in root %llu (level %d, ref count %d) returned %d for key (%llu %u %llu)",

		 ref->root_id, level, ref->count, ret,

		 ref->root_id, level, ref->count, ret,

		 ref->key_for_search.objectid, ref->key_for_search.type,

		 ref->key_for_search.objectid, ref->key_for_search.type,

		 ref->key_for_search.offset);

		 ref->key_for_search.offset);
@@ -1834,7 +1835,8 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 




	if (found_key->objectid > logical ||

	if (found_key->objectid > logical ||

	    found_key->objectid + size <= logical) {

	    found_key->objectid + size <= logical) {

		pr_debug("logical %llu is not within any extent\n", logical);

		btrfs_debug(fs_info,

			"logical %llu is not within any extent", logical);

		return -ENOENT;

		return -ENOENT;

	}

	}
@@ -1845,7 +1847,8 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 
	ei = btrfs_item_ptr(eb, path->slots[0], struct btrfs_extent_item);

	ei = btrfs_item_ptr(eb, path->slots[0], struct btrfs_extent_item);

	flags = btrfs_extent_flags(eb, ei);

	flags = btrfs_extent_flags(eb, ei);





	pr_debug("logical %llu is at position %llu within the extent (%llu EXTENT_ITEM %llu) flags %#llx size %u\n",

	btrfs_debug(fs_info,

		"logical %llu is at position %llu within the extent (%llu EXTENT_ITEM %llu) flags %#llx size %u",

		 logical, logical - found_key->objectid, found_key->objectid,

		 logical, logical - found_key->objectid, found_key->objectid,

		 found_key->offset, flags, item_size);

		 found_key->offset, flags, item_size);
@@ -1966,7 +1969,8 @@ int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb, 
	return 0;

	return 0;

}

}





static int iterate_leaf_refs(struct extent_inode_elem *inode_list,

static int iterate_leaf_refs(struct btrfs_fs_info *fs_info,

			     struct extent_inode_elem *inode_list,

			     u64 root, u64 extent_item_objectid,

			     u64 root, u64 extent_item_objectid,

			     iterate_extent_inodes_t *iterate, void *ctx)

			     iterate_extent_inodes_t *iterate, void *ctx)

{

{
@@ -1974,11 +1978,14 @@ static int iterate_leaf_refs(struct extent_inode_elem *inode_list, 
	int ret = 0;

	int ret = 0;





	for (eie = inode_list; eie; eie = eie->next) {

	for (eie = inode_list; eie; eie = eie->next) {

		pr_debug("ref for %llu resolved, key (%llu EXTEND_DATA %llu), root %llu\n", extent_item_objectid,

		btrfs_debug(fs_info,

			 eie->inum, eie->offset, root);

			    "ref for %llu resolved, key (%llu EXTEND_DATA %llu), root %llu",

			    extent_item_objectid, eie->inum,

			    eie->offset, root);

		ret = iterate(eie->inum, eie->offset, root, ctx);

		ret = iterate(eie->inum, eie->offset, root, ctx);

		if (ret) {

		if (ret) {

			pr_debug("stopping iteration for %llu due to ret=%d\n",

			btrfs_debug(fs_info,

				    "stopping iteration for %llu due to ret=%d",

				    extent_item_objectid, ret);

				    extent_item_objectid, ret);

			break;

			break;

		}

		}
@@ -2007,7 +2014,7 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info, 
	struct ulist_iterator ref_uiter;

	struct ulist_iterator ref_uiter;

	struct ulist_iterator root_uiter;

	struct ulist_iterator root_uiter;





	pr_debug("resolving all inodes for extent %llu\n",

	btrfs_debug(fs_info, "resolving all inodes for extent %llu",

			extent_item_objectid);

			extent_item_objectid);





	if (!search_commit_root) {

	if (!search_commit_root) {
@@ -2033,9 +2040,12 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info, 
			break;

			break;

		ULIST_ITER_INIT(&root_uiter);

		ULIST_ITER_INIT(&root_uiter);

		while (!ret && (root_node = ulist_next(roots, &root_uiter))) {

		while (!ret && (root_node = ulist_next(roots, &root_uiter))) {

			pr_debug("root %llu references leaf %llu, data list %#llx\n", root_node->val, ref_node->val,

			btrfs_debug(fs_info,

				    "root %llu references leaf %llu, data list %#llx",

				    root_node->val, ref_node->val,

				    ref_node->aux);

				    ref_node->aux);

			ret = iterate_leaf_refs((struct extent_inode_elem *)

			ret = iterate_leaf_refs(fs_info,

						(struct extent_inode_elem *)

						(uintptr_t)ref_node->aux,

						(uintptr_t)ref_node->aux,

						root_node->val,

						root_node->val,

						extent_item_objectid,

						extent_item_objectid,
@@ -2131,8 +2141,9 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root, 
		for (cur = 0; cur < btrfs_item_size(eb, item); cur += len) {

		for (cur = 0; cur < btrfs_item_size(eb, item); cur += len) {

			name_len = btrfs_inode_ref_name_len(eb, iref);

			name_len = btrfs_inode_ref_name_len(eb, iref);

			/* path must be released before calling iterate()! */

			/* path must be released before calling iterate()! */

			pr_debug("following ref at offset %u for inode %llu in tree %llu\n", cur, found_key.objectid,

			btrfs_debug(fs_root->fs_info,

				 fs_root->objectid);

				"following ref at offset %u for inode %llu in tree %llu",

				cur, found_key.objectid, fs_root->objectid);

			ret = iterate(parent, name_len,

			ret = iterate(parent, name_len,

				      (unsigned long)(iref + 1), eb, ctx);

				      (unsigned long)(iref + 1), eb, ctx);

			if (ret)

			if (ret)

fs/btrfs/compression.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -853,7 +853,7 @@ static struct list_head *find_workspace(int type) 
					/* no burst */ 1);

					/* no burst */ 1);





			if (__ratelimit(&_rs)) {

			if (__ratelimit(&_rs)) {

				pr_warn("no compression workspaces, low memory, retrying\n");

				pr_warn("BTRFS: no compression workspaces, low memory, retrying\n");

			}

			}

		}

		}

		goto again;

		goto again;

fs/btrfs/ctree.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -3395,7 +3395,7 @@ do { \ 
__cold

__cold

static inline void assfail(char *expr, char *file, int line)

static inline void assfail(char *expr, char *file, int line)

{

{

	pr_err("BTRFS: assertion failed: %s, file: %s, line: %d",

	pr_err("assertion failed: %s, file: %s, line: %d\n",

	       expr, file, line);

	       expr, file, line);

	BUG();

	BUG();

}

}

fs/btrfs/delayed-ref.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -322,7 +322,8 @@ int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, 
		elem = list_first_entry(&fs_info->tree_mod_seq_list,

		elem = list_first_entry(&fs_info->tree_mod_seq_list,

					struct seq_list, list);

					struct seq_list, list);

		if (seq >= elem->seq) {

		if (seq >= elem->seq) {

			pr_debug("holding back delayed_ref %#x.%x, lowest is %#x.%x (%p)\n",

			btrfs_debug(fs_info,

				"holding back delayed_ref %#x.%x, lowest is %#x.%x (%p)",

				(u32)(seq >> 32), (u32)seq,

				(u32)(seq >> 32), (u32)seq,

				(u32)(elem->seq >> 32), (u32)elem->seq,

				(u32)(elem->seq >> 32), (u32)elem->seq,

				delayed_refs);

				delayed_refs);

fs/btrfs/dev-replace.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -385,7 +385,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, char *tgtdev_name, 




	ret = btrfs_sysfs_add_device_link(tgt_device->fs_devices, tgt_device);

	ret = btrfs_sysfs_add_device_link(tgt_device->fs_devices, tgt_device);

	if (ret)

	if (ret)

		btrfs_err(fs_info, "kobj add dev failed %d\n", ret);

		btrfs_err(fs_info, "kobj add dev failed %d", ret);





	btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1);

	btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1);