aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-07-22 05:04:36 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2014-02-17 10:47:58 -0500
commit8fe605513ab4e96f9e078670da48c5fba3625955 (patch)
treea0d8028b28ac9f04e42c57cb0e32ab9e4fa371c4 /drivers/block
parent625a6ba2bd9d2720e64048188c6771b9da867884 (diff)
drbd: Rename drbdd_init() -> drbd_receiver()
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com> Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_main.c3
-rw-r--r--drivers/block/drbd/drbd_nl.c2
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
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 @@
58#include "drbd_vli.h" 58#include "drbd_vli.h"
59 59
60static DEFINE_MUTEX(drbd_main_mutex); 60static DEFINE_MUTEX(drbd_main_mutex);
61int drbd_receiver(struct drbd_thread *);
61int drbd_worker(struct drbd_thread *); 62int drbd_worker(struct drbd_thread *);
62 63
63int drbd_init(void); 64int drbd_init(void);
@@ -2614,7 +2615,7 @@ struct drbd_connection *conn_create(const char *name, struct res_opts *res_opts)
2614 mutex_init(&connection->data.mutex); 2615 mutex_init(&connection->data.mutex);
2615 mutex_init(&connection->meta.mutex); 2616 mutex_init(&connection->meta.mutex);
2616 2617
2617 drbd_thread_init(connection, &connection->receiver, drbdd_init, "receiver"); 2618 drbd_thread_init(connection, &connection->receiver, drbd_receiver, "receiver");
2618 drbd_thread_init(connection, &connection->worker, drbd_worker, "worker"); 2619 drbd_thread_init(connection, &connection->worker, drbd_worker, "worker");
2619 drbd_thread_init(connection, &connection->asender, drbd_asender, "asender"); 2620 drbd_thread_init(connection, &connection->asender, drbd_asender, "asender");
2620 2621
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
2332 /* Race breaker. This additional state change request may be 2332 /* Race breaker. This additional state change request may be
2333 * necessary, if this was a forced disconnect during a receiver 2333 * necessary, if this was a forced disconnect during a receiver
2334 * restart. We may have "killed" the receiver thread just 2334 * restart. We may have "killed" the receiver thread just
2335 * after drbdd_init() returned. Typically, we should be 2335 * after drbd_receiver() returned. Typically, we should be
2336 * C_STANDALONE already, now, and this becomes a no-op. 2336 * C_STANDALONE already, now, and this becomes a no-op.
2337 */ 2337 */
2338 rv2 = conn_request_state(connection, NS(conn, C_STANDALONE), 2338 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)
4844} 4844}
4845#endif 4845#endif
4846 4846
4847int drbdd_init(struct drbd_thread *thi) 4847int drbd_receiver(struct drbd_thread *thi)
4848{ 4848{
4849 struct drbd_connection *connection = thi->connection; 4849 struct drbd_connection *connection = thi->connection;
4850 int h; 4850 int h;