aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-07-25 13:51:18 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2014-02-17 16:50:38 +0100
commit8682eae9b4b26d54b9eeac8e17c534197e6d8744 (patch)
tree2d44a33901a0e3d6efaa1663cd7fe186b3650aec /drivers/block/drbd/drbd_receiver.c
parentdrbd: Move string function prototypes from linux/drbd.h to drbd_string.h (diff)
downloadlinux-dev-8682eae9b4b26d54b9eeac8e17c534197e6d8744.tar.xz
linux-dev-8682eae9b4b26d54b9eeac8e17c534197e6d8744.zip
drbd: Rename w_prev_work_done -> w_complete
Also move it to drbd_receiver.c and make it static. Signed-off-by: Andreas Gruenbacher <agruen@linbit.com> Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r--drivers/block/drbd/drbd_receiver.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 1fc87a389b9c..e262b0bcbf67 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4482,11 +4482,19 @@ static void drbdd(struct drbd_connection *connection)
conn_request_state(connection, NS(conn, C_PROTOCOL_ERROR), CS_HARD);
}
+static int w_complete(struct drbd_work *w, int cancel)
+{
+ struct drbd_wq_barrier *b = container_of(w, struct drbd_wq_barrier, w);
+
+ complete(&b->done);
+ return 0;
+}
+
void conn_flush_workqueue(struct drbd_connection *connection)
{
struct drbd_wq_barrier barr;
- barr.w.cb = w_prev_work_done;
+ barr.w.cb = w_complete;
barr.w.connection = connection;
init_completion(&barr.done);
drbd_queue_work(&connection->sender_work, &barr.w);