diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-07-25 11:51:18 (GMT) |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 15:50:38 (GMT) |
| commit | 8682eae9b4b26d54b9eeac8e17c534197e6d8744 (patch) | |
| tree | 2d44a33901a0e3d6efaa1663cd7fe186b3650aec /drivers/block | |
| parent | d9f65229f6257842eb7badef015719432b3d16a6 (diff) | |
| download | linux-8682eae9b4b26d54b9eeac8e17c534197e6d8744.tar.xz | |
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')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 1 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 10 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 0840e9c..ab3111e 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -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_send_dblock(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_restart_disk_io(struct drbd_work *, int); extern int w_send_out_of_sync(struct drbd_work *, int); diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 1fc87a3..e262b0b 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); diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 3c69e73..cb9ba14 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -1262,14 +1262,6 @@ int w_e_end_ov_reply(struct drbd_work *w, int cancel) 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 * We need to track the number of pending barrier acks, * and to be able to wait for them. |