drbd: use resource name in workqueue

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

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

2 files changed, 6 insertions, 3 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 938bca2df027..3a9a0f112004 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -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;
 
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index ea54341df3bf..1957fe8601dc 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1124,7 +1124,10 @@ randomize:
         }
 
         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;