drbd: Moved the thread name into the data structure
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 4da4c32..e85221f 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -119,13 +119,9 @@
if (!__ratelimit(&drbd_ratelimit_state))
return;
dev_err(DEV, "FIXME %s in %s, bitmap locked for '%s' by %s\n",
- current == mdev->tconn->receiver.task ? "receiver" :
- current == mdev->tconn->asender.task ? "asender" :
- current == mdev->tconn->worker.task ? "worker" : current->comm,
- func, b->bm_why ?: "?",
- b->bm_task == mdev->tconn->receiver.task ? "receiver" :
- b->bm_task == mdev->tconn->asender.task ? "asender" :
- b->bm_task == mdev->tconn->worker.task ? "worker" : "?");
+ drbd_task_to_thread_name(mdev, current),
+ func, b->bm_why ?: "?",
+ drbd_task_to_thread_name(mdev, b->bm_task));
}
void drbd_bm_lock(struct drbd_conf *mdev, char *why, enum bm_flag flags)
@@ -142,13 +138,9 @@
if (trylock_failed) {
dev_warn(DEV, "%s going to '%s' but bitmap already locked for '%s' by %s\n",
- current == mdev->tconn->receiver.task ? "receiver" :
- current == mdev->tconn->asender.task ? "asender" :
- current == mdev->tconn->worker.task ? "worker" : current->comm,
- why, b->bm_why ?: "?",
- b->bm_task == mdev->tconn->receiver.task ? "receiver" :
- b->bm_task == mdev->tconn->asender.task ? "asender" :
- b->bm_task == mdev->tconn->worker.task ? "worker" : "?");
+ drbd_task_to_thread_name(mdev, current),
+ why, b->bm_why ?: "?",
+ drbd_task_to_thread_name(mdev, b->bm_task));
mutex_lock(&b->bm_change);
}
if (BM_LOCKED_MASK & b->bm_flags)