Commit 8682eae9 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner

drbd: Rename w_prev_work_done -> w_complete

Also move it to drbd_receiver.c and make it static.
Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent d9f65229
...@@ -1326,7 +1326,6 @@ extern int w_send_write_hint(struct drbd_work *, int); ...@@ -1326,7 +1326,6 @@ extern int w_send_write_hint(struct drbd_work *, int);
extern int w_make_resync_request(struct drbd_work *, int); extern int w_make_resync_request(struct drbd_work *, int);
extern int w_send_dblock(struct drbd_work *, int); extern int w_send_dblock(struct drbd_work *, int);
extern int w_send_read_req(struct drbd_work *, int); extern int w_send_read_req(struct drbd_work *, int);
extern int w_prev_work_done(struct drbd_work *, int);
extern int w_e_reissue(struct drbd_work *, int); extern int w_e_reissue(struct drbd_work *, int);
extern int w_restart_disk_io(struct drbd_work *, int); extern int w_restart_disk_io(struct drbd_work *, int);
extern int w_send_out_of_sync(struct drbd_work *, int); extern int w_send_out_of_sync(struct drbd_work *, int);
......
...@@ -4482,11 +4482,19 @@ static void drbdd(struct drbd_connection *connection) ...@@ -4482,11 +4482,19 @@ static void drbdd(struct drbd_connection *connection)
conn_request_state(connection, NS(conn, C_PROTOCOL_ERROR), CS_HARD); 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) void conn_flush_workqueue(struct drbd_connection *connection)
{ {
struct drbd_wq_barrier barr; struct drbd_wq_barrier barr;
barr.w.cb = w_prev_work_done; barr.w.cb = w_complete;
barr.w.connection = connection; barr.w.connection = connection;
init_completion(&barr.done); init_completion(&barr.done);
drbd_queue_work(&connection->sender_work, &barr.w); drbd_queue_work(&connection->sender_work, &barr.w);
......
...@@ -1262,14 +1262,6 @@ int w_e_end_ov_reply(struct drbd_work *w, int cancel) ...@@ -1262,14 +1262,6 @@ int w_e_end_ov_reply(struct drbd_work *w, int cancel)
return err; return err;
} }
int w_prev_work_done(struct drbd_work *w, int cancel)
{
struct drbd_wq_barrier *b = container_of(w, struct drbd_wq_barrier, w);
complete(&b->done);
return 0;
}
/* FIXME /* FIXME
* We need to track the number of pending barrier acks, * We need to track the number of pending barrier acks,
* and to be able to wait for them. * and to be able to wait for them.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment