From 8fe605513ab4e96f9e078670da48c5fba3625955 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 22 Jul 2011 11:04:36 +0200 Subject: [PATCH] drbd: Rename drbdd_init() -> drbd_receiver() Signed-off-by: Andreas Gruenbacher Signed-off-by: Philipp Reisner --- drivers/block/drbd/drbd_main.c | 3 ++- drivers/block/drbd/drbd_nl.c | 2 +- drivers/block/drbd/drbd_receiver.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index b0b2eb172491..025b336dd571 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -58,6 +58,7 @@ #include "drbd_vli.h" static DEFINE_MUTEX(drbd_main_mutex); +int drbd_receiver(struct drbd_thread *); int drbd_worker(struct drbd_thread *); int drbd_init(void); @@ -2614,7 +2615,7 @@ struct drbd_connection *conn_create(const char *name, struct res_opts *res_opts) mutex_init(&connection->data.mutex); mutex_init(&connection->meta.mutex); - drbd_thread_init(connection, &connection->receiver, drbdd_init, "receiver"); + drbd_thread_init(connection, &connection->receiver, drbd_receiver, "receiver"); drbd_thread_init(connection, &connection->worker, drbd_worker, "worker"); drbd_thread_init(connection, &connection->asender, drbd_asender, "asender"); diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 5ed169d6cf5a..63b345dbcc1c 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -2332,7 +2332,7 @@ static enum drbd_state_rv conn_try_disconnect(struct drbd_connection *connection /* Race breaker. This additional state change request may be * necessary, if this was a forced disconnect during a receiver * restart. We may have "killed" the receiver thread just - * after drbdd_init() returned. Typically, we should be + * after drbd_receiver() returned. Typically, we should be * C_STANDALONE already, now, and this becomes a no-op. */ rv2 = conn_request_state(connection, NS(conn, C_STANDALONE), diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 5d9e5cc3feeb..c5fd1cfaaab8 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -4844,7 +4844,7 @@ static int drbd_do_auth(struct drbd_connection *connection) } #endif -int drbdd_init(struct drbd_thread *thi) +int drbd_receiver(struct drbd_thread *thi) { struct drbd_connection *connection = thi->connection; int h; -- 2.39.2