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

Commit 39e91a60 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe
Browse files

drbd: use resource name in workqueue 



Since kernel 3.3, we can use snprintf-style arguments
to create a workqueue.

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 f5ec0173

drivers/block/drbd/drbd_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2694,8 +2694,8 @@ static int init_submitter(struct drbd_device *device) 
{

	/* opencoded create_singlethread_workqueue(),

	 * to be able to say "drbd%d", ..., minor */

	device->submit.wq = alloc_workqueue("drbd%u_submit",

			WQ_UNBOUND | WQ_MEM_RECLAIM, 1, device->minor);

	device->submit.wq =

		alloc_ordered_workqueue("drbd%u_submit", WQ_MEM_RECLAIM, device->minor);

	if (!device->submit.wq)

		return -ENOMEM;

drivers/block/drbd/drbd_receiver.c

+4 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,10 @@ static int conn_connect(struct drbd_connection *connection) 
	}



	drbd_thread_start(&connection->ack_receiver);

	connection->ack_sender = create_singlethread_workqueue("drbd_ack_sender");

	/* opencoded create_singlethread_workqueue(),

	 * to be able to use format string arguments */

	connection->ack_sender =

		alloc_ordered_workqueue("drbd_as_%s", WQ_MEM_RECLAIM, connection->resource->name);

	if (!connection->ack_sender) {

		drbd_err(connection, "Failed to create workqueue ack_sender\n");

		return 0;