[PATCH 096/118] drbd: Consolidated the setup of the thread name into the framework

Philipp Reisner
2011-08-25T15:10:10Z

drivers/block/drbd/drbd_main.c | 3 +++
drivers/block/drbd/drbd_receiver.c | 5 -----
drivers/block/drbd/drbd_worker.c | 2 --
3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index b054b7b..4589be4 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -458,6 +458,9 @@ static int drbd_thread_setup(void *arg)
unsigned long flags;
int retval;

+ snprintf(current->comm, sizeof(current->comm), "drbd_%c_%s",
+ thi->name[0], thi->mdev->tconn->name);
+
restart:
retval = thi->function(thi);

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 183e533..3fcc8dc 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4230,11 +4230,8 @@ static int drbd_do_auth(struct drbd_tconn *tconn)
int drbdd_init(struct drbd_thread *thi)
{
struct drbd_conf *mdev = thi->mdev;
- unsigned int minor = mdev_to_minor(mdev);
int h;

- sprintf(current->comm, "drbd%d_receiver", minor);
-
dev_info(DEV, "receiver (re)started\n");

do {
@@ -4575,8 +4572,6 @@ int drbd_asender(struct drbd_thread *thi)
int ping_timeout_active = 0;
int empty;

- sprintf(current->comm, "drbd%d_asender", mdev_to_minor(mdev));
-
current->policy = SCHED_RR; /* Make this a realtime task! */
current->rt_priority = 2; /* more important than all other tasks */

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index cac65f6..6f70962 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -1631,8 +1631,6 @@ int drbd_worker(struct drbd_thread *thi)
LIST_HEAD(work_list);
int intr = 0, i;

- sprintf(current->comm, "drbd%d_worker", mdev_to_minor(mdev));
-
while (get_t_state(thi) == RUNNING) {
drbd_thread_current_set_cpu(thi);

--
1.7.4.1