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

Commit efe120a0 authored by Frank Holton's avatar Frank Holton Committed by Chris Mason
Browse files

Btrfs: convert printk to btrfs_ and fix BTRFS prefix 



Convert all applicable cases of printk and pr_* to the btrfs_* macros.

Fix all uses of the BTRFS prefix.

Signed-off-by: default avatarFrank Holton <fholton@gmail.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 5de865ee

fs/btrfs/compression.c

+6 −6
Original line number Diff line number Diff line
@@ -128,9 +128,8 @@ static int check_compressed_csum(struct inode *inode, 
		kunmap_atomic(kaddr);



		if (csum != *cb_sum) {

			printk(KERN_INFO "btrfs csum failed ino %llu "

			       "extent %llu csum %u "

			       "wanted %u mirror %d\n",

			btrfs_info(BTRFS_I(inode)->root->fs_info,

			   "csum failed ino %llu extent %llu csum %u wanted %u mirror %d",

			   btrfs_ino(inode), disk_start, csum, *cb_sum,

			   cb->mirror_num);

			ret = -EIO;
@@ -412,7 +411,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
			bio_add_page(bio, page, PAGE_CACHE_SIZE, 0);

		}

		if (bytes_left < PAGE_CACHE_SIZE) {

			printk("bytes left %lu compress len %lu nr %lu\n",

			btrfs_info(BTRFS_I(inode)->root->fs_info,

					"bytes left %lu compress len %lu nr %lu",

			       bytes_left, cb->compressed_len, cb->nr_pages);

		}

		bytes_left -= PAGE_CACHE_SIZE;

fs/btrfs/ctree.c

+8 −8
Original line number Diff line number Diff line
@@ -1480,8 +1480,8 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
		old = read_tree_block(root, logical, blocksize, 0);

		if (WARN_ON(!old || !extent_buffer_uptodate(old))) {

			free_extent_buffer(old);

			pr_warn("btrfs: failed to read tree block %llu from get_old_root\n",

				logical);

			btrfs_warn(root->fs_info,

				"failed to read tree block %llu from get_old_root", logical);

		} else {

			eb = btrfs_clone_extent_buffer(old);

			free_extent_buffer(old);
@@ -3611,8 +3611,8 @@ noinline int btrfs_leaf_free_space(struct btrfs_root *root, 
	int ret;

	ret = BTRFS_LEAF_DATA_SIZE(root) - leaf_space_used(leaf, 0, nritems);

	if (ret < 0) {

		printk(KERN_CRIT "leaf free space ret %d, leaf data size %lu, "

		       "used %d nritems %d\n",

		btrfs_crit(root->fs_info,

			"leaf free space ret %d, leaf data size %lu, used %d nritems %d",

		       ret, (unsigned long) BTRFS_LEAF_DATA_SIZE(root),

		       leaf_space_used(leaf, 0, nritems), nritems);

	}
@@ -4702,7 +4702,7 @@ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path, 
	BUG_ON(slot < 0);

	if (slot >= nritems) {

		btrfs_print_leaf(root, leaf);

		printk(KERN_CRIT "slot %d too large, nritems %d\n",

		btrfs_crit(root->fs_info, "slot %d too large, nritems %d",

		       slot, nritems);

		BUG_ON(1);

	}
@@ -4765,7 +4765,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, 


	if (btrfs_leaf_free_space(root, leaf) < total_size) {

		btrfs_print_leaf(root, leaf);

		printk(KERN_CRIT "not enough freespace need %u have %d\n",

		btrfs_crit(root->fs_info, "not enough freespace need %u have %d",

		       total_size, btrfs_leaf_free_space(root, leaf));

		BUG();

	}
@@ -4775,7 +4775,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, 


		if (old_data < data_end) {

			btrfs_print_leaf(root, leaf);

			printk(KERN_CRIT "slot %d old_data %d data_end %d\n",

			btrfs_crit(root->fs_info, "slot %d old_data %d data_end %d",

			       slot, old_data, data_end);

			BUG_ON(1);

		}
@@ -5510,7 +5510,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root, 


			if (!left_start_ctransid || !right_start_ctransid) {

				WARN(1, KERN_WARNING

					"btrfs: btrfs_compare_tree detected "

					"BTRFS: btrfs_compare_tree detected "

					"a change in one of the trees while "

					"iterating. This is probably a "

					"bug.\n");

fs/btrfs/ctree.h

+2 −2
Original line number Diff line number Diff line
@@ -3838,7 +3838,7 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...) 


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

{

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

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

	       expr, file, line);

	BUG();

}
@@ -3876,7 +3876,7 @@ static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, 
		if (!(features & flag)) {

			features |= flag;

			btrfs_set_super_incompat_flags(disk_super, features);

			printk(KERN_INFO "btrfs: setting %llu feature flag\n",

			btrfs_info(fs_info, "setting %llu feature flag",

					 flag);

		}

		spin_unlock(&fs_info->super_lock);

fs/btrfs/delayed-inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1472,9 +1472,9 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
	mutex_lock(&delayed_node->mutex);

	ret = __btrfs_add_delayed_insertion_item(delayed_node, delayed_item);

	if (unlikely(ret)) {

		printk(KERN_ERR "err add delayed dir index item(name: %.*s) "

		btrfs_err(root->fs_info, "err add delayed dir index item(name: %.*s) "

				"into the insertion tree of the delayed node"

				"(root id: %llu, inode id: %llu, errno: %d)\n",

				"(root id: %llu, inode id: %llu, errno: %d)",

				name_len, name, delayed_node->root->objectid,

				delayed_node->inode_id, ret);

		BUG();
@@ -1544,9 +1544,9 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
	mutex_lock(&node->mutex);

	ret = __btrfs_add_delayed_deletion_item(node, item);

	if (unlikely(ret)) {

		printk(KERN_ERR "err add delayed dir index item(index: %llu) "

		btrfs_err(root->fs_info, "err add delayed dir index item(index: %llu) "

				"into the deletion tree of the delayed node"

				"(root id: %llu, inode id: %llu, errno: %d)\n",

				"(root id: %llu, inode id: %llu, errno: %d)",

				index, node->root->objectid, node->inode_id,

				ret);

		BUG();

fs/btrfs/dev-replace.c

+32 −24
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ no_valid_dev_replace_entry_found: 
	ptr = btrfs_item_ptr(eb, slot, struct btrfs_dev_replace_item);



	if (item_size != sizeof(struct btrfs_dev_replace_item)) {

		pr_warn("btrfs: dev_replace entry found has unexpected size, ignore entry\n");

		btrfs_warn(fs_info,

			"dev_replace entry found has unexpected size, ignore entry");

		goto no_valid_dev_replace_entry_found;

	}
@@ -145,13 +146,19 @@ no_valid_dev_replace_entry_found: 
		if (!dev_replace->srcdev &&

		    !btrfs_test_opt(dev_root, DEGRADED)) {

			ret = -EIO;

			pr_warn("btrfs: cannot mount because device replace operation is ongoing and\n" "srcdev (devid %llu) is missing, need to run 'btrfs dev scan'?\n",

			btrfs_warn(fs_info,

			   "cannot mount because device replace operation is ongoing and");

			btrfs_warn(fs_info,

			   "srcdev (devid %llu) is missing, need to run 'btrfs dev scan'?",

			   src_devid);

		}

		if (!dev_replace->tgtdev &&

		    !btrfs_test_opt(dev_root, DEGRADED)) {

			ret = -EIO;

			pr_warn("btrfs: cannot mount because device replace operation is ongoing and\n" "tgtdev (devid %llu) is missing, need to run btrfs dev scan?\n",

			btrfs_warn(fs_info,

			   "cannot mount because device replace operation is ongoing and");

			btrfs_warn(fs_info,

			   "tgtdev (devid %llu) is missing, need to run 'btrfs dev scan'?",

				BTRFS_DEV_REPLACE_DEVID);

		}

		if (dev_replace->tgtdev) {
@@ -210,7 +217,7 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans, 
	}

	ret = btrfs_search_slot(trans, dev_root, &key, path, -1, 1);

	if (ret < 0) {

		pr_warn("btrfs: error %d while searching for dev_replace item!\n",

		btrfs_warn(fs_info, "error %d while searching for dev_replace item!",

			ret);

		goto out;

	}
@@ -230,7 +237,7 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans, 
		 */

		ret = btrfs_del_item(trans, dev_root, path);

		if (ret != 0) {

			pr_warn("btrfs: delete too small dev_replace item failed %d!\n",

			btrfs_warn(fs_info, "delete too small dev_replace item failed %d!",

				ret);

			goto out;

		}
@@ -243,7 +250,7 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans, 
		ret = btrfs_insert_empty_item(trans, dev_root, path,

					      &key, sizeof(*ptr));

		if (ret < 0) {

			pr_warn("btrfs: insert dev_replace item failed %d!\n",

			btrfs_warn(fs_info, "insert dev_replace item failed %d!",

				ret);

			goto out;

		}
@@ -305,7 +312,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	struct btrfs_device *src_device = NULL;



	if (btrfs_fs_incompat(fs_info, RAID56)) {

		pr_warn("btrfs: dev_replace cannot yet handle RAID5/RAID6\n");

		btrfs_warn(fs_info, "dev_replace cannot yet handle RAID5/RAID6");

		return -EINVAL;

	}
@@ -325,7 +332,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	ret = btrfs_init_dev_replace_tgtdev(root, args->start.tgtdev_name,

					    &tgt_device);

	if (ret) {

		pr_err("btrfs: target device %s is invalid!\n",

		btrfs_err(fs_info, "target device %s is invalid!",

		       args->start.tgtdev_name);

		mutex_unlock(&fs_info->volume_mutex);

		return -EINVAL;
@@ -341,7 +348,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	}



	if (tgt_device->total_bytes < src_device->total_bytes) {

		pr_err("btrfs: target device is smaller than source device!\n");

		btrfs_err(fs_info, "target device is smaller than source device!");

		ret = -EINVAL;

		goto leave_no_lock;

	}
@@ -366,7 +373,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	dev_replace->tgtdev = tgt_device;



	printk_in_rcu(KERN_INFO

		      "btrfs: dev_replace from %s (devid %llu) to %s started\n",

		      "BTRFS: dev_replace from %s (devid %llu) to %s started\n",

		      src_device->missing ? "<missing disk>" :

		        rcu_str_deref(src_device->name),

		      src_device->devid,
@@ -489,7 +496,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 


	if (scrub_ret) {

		printk_in_rcu(KERN_ERR

			      "btrfs: btrfs_scrub_dev(%s, %llu, %s) failed %d\n",

			      "BTRFS: btrfs_scrub_dev(%s, %llu, %s) failed %d\n",

			      src_device->missing ? "<missing disk>" :

			        rcu_str_deref(src_device->name),

			      src_device->devid,
@@ -504,7 +511,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
	}



	printk_in_rcu(KERN_INFO

		      "btrfs: dev_replace from %s (devid %llu) to %s) finished\n",

		      "BTRFS: dev_replace from %s (devid %llu) to %s) finished\n",

		      src_device->missing ? "<missing disk>" :

		        rcu_str_deref(src_device->name),

		      src_device->devid,
@@ -699,7 +706,7 @@ void btrfs_dev_replace_suspend_for_unmount(struct btrfs_fs_info *fs_info) 
			BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED;

		dev_replace->time_stopped = get_seconds();

		dev_replace->item_needs_writeback = 1;

		pr_info("btrfs: suspending dev_replace for unmount\n");

		btrfs_info(fs_info, "suspending dev_replace for unmount");

		break;

	}
@@ -728,8 +735,9 @@ int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info) 
		break;

	}

	if (!dev_replace->tgtdev || !dev_replace->tgtdev->bdev) {

		pr_info("btrfs: cannot continue dev_replace, tgtdev is missing\n"

			"btrfs: you may cancel the operation after 'mount -o degraded'\n");

		btrfs_info(fs_info, "cannot continue dev_replace, tgtdev is missing");

		btrfs_info(fs_info,

			"you may cancel the operation after 'mount -o degraded'");

		btrfs_dev_replace_unlock(dev_replace);

		return 0;

	}
@@ -755,7 +763,7 @@ static int btrfs_dev_replace_kthread(void *data) 
		kfree(status_args);

		do_div(progress, 10);

		printk_in_rcu(KERN_INFO

			      "btrfs: continuing dev_replace from %s (devid %llu) to %s @%u%%\n",

			"BTRFS: continuing dev_replace from %s (devid %llu) to %s @%u%%\n",

			dev_replace->srcdev->missing ? "<missing disk>" :

			rcu_str_deref(dev_replace->srcdev->name),

			dev_replace->srcdev->devid,