Commit 1243172d authored by Yu Kuai's avatar Yu Kuai Committed by Jens Axboe
Browse files

nbd: use pr_err to output error message 



Instead of using the long printk(KERN_ERR "nbd: ...") to
output error message, defining pr_fmt and using
the short pr_err("") to do that. The replacemen is done
by using the following command:

  sed -i 's/printk(KERN_ERR "nbd: /pr_err("/g' \
		  drivers/block/nbd.c

This patch also rewrap to 80 columns where possible.

Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Link: https://lore.kernel.org/r/20220521073749.3146892-7-yukuai3@huawei.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 858f1bf6

drivers/block/nbd.c

+18 −22
Original line number Diff line number Diff line
@@ -1928,16 +1928,16 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) 
		 * MKDEV() expect that the max bits of first_minor is 20.

		 */

		if (index < 0 || index > MINORMASK >> part_shift) {

			printk(KERN_ERR "nbd: illegal input index %d\n", index);

			pr_err("illegal input index %d\n", index);

			return -EINVAL;

		}

	}

	if (!info->attrs[NBD_ATTR_SOCKETS]) {

		printk(KERN_ERR "nbd: must specify at least one socket\n");

		pr_err("must specify at least one socket\n");

		return -EINVAL;

	}

	if (!info->attrs[NBD_ATTR_SIZE_BYTES]) {

		printk(KERN_ERR "nbd: must specify a size in bytes for the device\n");

		pr_err("must specify a size in bytes for the device\n");

		return -EINVAL;

	}

again:
@@ -1973,7 +1973,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) 
		nbd_put(nbd);

		if (index == -1)

			goto again;

		printk(KERN_ERR "nbd: nbd%d already in use\n", index);

		pr_err("nbd%d already in use\n", index);

		return -EBUSY;

	}

	if (WARN_ON(nbd->config)) {
@@ -1985,7 +1985,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) 
	if (IS_ERR(config)) {

		mutex_unlock(&nbd->config_lock);

		nbd_put(nbd);

		printk(KERN_ERR "nbd: couldn't allocate config\n");

		pr_err("couldn't allocate config\n");

		return PTR_ERR(config);

	}

	nbd->config = config;
@@ -2041,7 +2041,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) 
			struct nlattr *socks[NBD_SOCK_MAX+1];



			if (nla_type(attr) != NBD_SOCK_ITEM) {

				printk(KERN_ERR "nbd: socks must be embedded in a SOCK_ITEM attr\n");

				pr_err("socks must be embedded in a SOCK_ITEM attr\n");

				ret = -EINVAL;

				goto out;

			}
@@ -2050,7 +2050,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) 
							  nbd_sock_policy,

							  info->extack);

			if (ret != 0) {

				printk(KERN_ERR "nbd: error processing sock list\n");

				pr_err("error processing sock list\n");

				ret = -EINVAL;

				goto out;

			}
@@ -2122,7 +2122,7 @@ static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info) 
		return -EPERM;



	if (!info->attrs[NBD_ATTR_INDEX]) {

		printk(KERN_ERR "nbd: must specify an index to disconnect\n");

		pr_err("must specify an index to disconnect\n");

		return -EINVAL;

	}

	index = nla_get_u32(info->attrs[NBD_ATTR_INDEX]);
@@ -2130,14 +2130,12 @@ static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info) 
	nbd = idr_find(&nbd_index_idr, index);

	if (!nbd) {

		mutex_unlock(&nbd_index_mutex);

		printk(KERN_ERR "nbd: couldn't find device at index %d\n",

		       index);

		pr_err("couldn't find device at index %d\n", index);

		return -EINVAL;

	}

	if (!refcount_inc_not_zero(&nbd->refs)) {

		mutex_unlock(&nbd_index_mutex);

		printk(KERN_ERR "nbd: device at index %d is going down\n",

		       index);

		pr_err("device at index %d is going down\n", index);

		return -EINVAL;

	}

	mutex_unlock(&nbd_index_mutex);
@@ -2162,7 +2160,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
		return -EPERM;



	if (!info->attrs[NBD_ATTR_INDEX]) {

		printk(KERN_ERR "nbd: must specify a device to reconfigure\n");

		pr_err("must specify a device to reconfigure\n");

		return -EINVAL;

	}

	index = nla_get_u32(info->attrs[NBD_ATTR_INDEX]);
@@ -2170,8 +2168,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
	nbd = idr_find(&nbd_index_idr, index);

	if (!nbd) {

		mutex_unlock(&nbd_index_mutex);

		printk(KERN_ERR "nbd: couldn't find a device at index %d\n",

		       index);

		pr_err("couldn't find a device at index %d\n", index);

		return -EINVAL;

	}

	if (nbd->backend) {
@@ -2192,8 +2189,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
	}

	if (!refcount_inc_not_zero(&nbd->refs)) {

		mutex_unlock(&nbd_index_mutex);

		printk(KERN_ERR "nbd: device at index %d is going down\n",

		       index);

		pr_err("device at index %d is going down\n", index);

		return -EINVAL;

	}

	mutex_unlock(&nbd_index_mutex);
@@ -2257,7 +2253,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
			struct nlattr *socks[NBD_SOCK_MAX+1];



			if (nla_type(attr) != NBD_SOCK_ITEM) {

				printk(KERN_ERR "nbd: socks must be embedded in a SOCK_ITEM attr\n");

				pr_err("socks must be embedded in a SOCK_ITEM attr\n");

				ret = -EINVAL;

				goto out;

			}
@@ -2266,7 +2262,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
							  nbd_sock_policy,

							  info->extack);

			if (ret != 0) {

				printk(KERN_ERR "nbd: error processing sock list\n");

				pr_err("error processing sock list\n");

				ret = -EINVAL;

				goto out;

			}
@@ -2483,7 +2479,7 @@ static int __init nbd_init(void) 
	BUILD_BUG_ON(sizeof(struct nbd_request) != 28);



	if (max_part < 0) {

		printk(KERN_ERR "nbd: max_part must be >= 0\n");

		pr_err("max_part must be >= 0\n");

		return -EINVAL;

	}
@@ -2562,10 +2558,10 @@ static void __exit nbd_cleanup(void) 
		nbd = list_first_entry(&del_list, struct nbd_device, list);

		list_del_init(&nbd->list);

		if (refcount_read(&nbd->config_refs))

			printk(KERN_ERR "nbd: possibly leaking nbd_config (ref %d)\n",

			pr_err("possibly leaking nbd_config (ref %d)\n",

					refcount_read(&nbd->config_refs));

		if (refcount_read(&nbd->refs) != 1)

			printk(KERN_ERR "nbd: possibly leaking a device\n");

			pr_err("possibly leaking a device\n");

		nbd_put(nbd);

	}