drbd: Rename drbdd_init() -> drbd_receiver()

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index b0b2eb172491ed355c06440c6b4f6b291c1f93ce..025b336dd5711e29f4abc4e0ed68d9c0caa060e9 100644 (file)
--- 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 5ed169d6cf5aba77594e59b3b8388567bc131e03..63b345dbcc1cba725c40b2df3eaf0197386980eb 100644 (file)
--- 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 5d9e5cc3feeb5732f3805127237bdbc8a667b1de..c5fd1cfaaab8421fa737f07a5ede60134bbbc15a 100644 (file)
--- 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;