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

Commit f221f4bc authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Jens Axboe
Browse files

drbd: Only use drbd_msg_put_info() in drbd_nl.c 



Avoid generic netlink calls in other parts of the code base.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 179e20b8

drivers/block/drbd/drbd_int.h

+0 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,6 @@ extern int is_valid_ar_handle(struct drbd_request *, sector_t); 




/* drbd_nl.c */

extern int drbd_msg_put_info(struct sk_buff *skb, const char *info);

extern void drbd_suspend_io(struct drbd_device *device);

extern void drbd_resume_io(struct drbd_device *device);

extern char *ppsize(char *buf, unsigned long long size);

drivers/block/drbd/drbd_main.c

+3 −14
Original line number Diff line number Diff line
@@ -2532,10 +2532,6 @@ int set_resource_options(struct drbd_resource *resource, struct res_opts *res_op 


	if (!zalloc_cpumask_var(&new_cpu_mask, GFP_KERNEL))

		return -ENOMEM;

		/*

		retcode = ERR_NOMEM;

		drbd_msg_put_info("unable to allocate cpumask");

		*/



	/* silently ignore cpu mask on UP kernel */

	if (nr_cpu_ids > 1 && res_opts->cpu_mask[0] != 0) {
@@ -2793,20 +2789,16 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 


	id = idr_alloc(&drbd_devices, device, minor, minor + 1, GFP_KERNEL);

	if (id < 0) {

		if (id == -ENOSPC) {

		if (id == -ENOSPC)

			err = ERR_MINOR_OR_VOLUME_EXISTS;

			drbd_msg_put_info(adm_ctx->reply_skb, "requested minor exists already");

		}

		goto out_no_minor_idr;

	}

	kref_get(&device->kref);



	id = idr_alloc(&resource->devices, device, vnr, vnr + 1, GFP_KERNEL);

	if (id < 0) {

		if (id == -ENOSPC) {

		if (id == -ENOSPC)

			err = ERR_MINOR_OR_VOLUME_EXISTS;

			drbd_msg_put_info(adm_ctx->reply_skb, "requested minor exists already");

		}

		goto out_idr_remove_minor;

	}

	kref_get(&device->kref);
@@ -2825,10 +2817,8 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 


		id = idr_alloc(&connection->peer_devices, peer_device, vnr, vnr + 1, GFP_KERNEL);

		if (id < 0) {

			if (id == -ENOSPC) {

			if (id == -ENOSPC)

				err = ERR_INVALID_REQUEST;

				drbd_msg_put_info(adm_ctx->reply_skb, "requested volume exists already");

			}

			goto out_idr_remove_from_resource;

		}

		kref_get(&connection->kref);
@@ -2836,7 +2826,6 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 


	if (init_submitter(device)) {

		err = ERR_NOMEM;

		drbd_msg_put_info(adm_ctx->reply_skb, "unable to create submit workqueue");

		goto out_idr_remove_vol;

	}

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void drbd_adm_send_reply(struct sk_buff *skb, struct genl_info *info) 


/* Used on a fresh "drbd_adm_prepare"d reply_skb, this cannot fail: The only

 * reason it could fail was no space in skb, and there are 4k available. */

int drbd_msg_put_info(struct sk_buff *skb, const char *info)

static int drbd_msg_put_info(struct sk_buff *skb, const char *info)

{

	struct nlattr *nla;

	int err = -EMSGSIZE;