diff options
| author | Philipp Reisner | 2011-02-18 14:23:11 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-10-14 16:47:55 +0200 |
| commit | 0e29d163f7ec8369b3f1fb70900d29b1c4a1dc8b (patch) | |
| tree | 557ced24ba1538dda76daef67b3012c5429a5d1a /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Remove left-over function prototypes (diff) | |
| download | kernel-qcow2-linux-0e29d163f7ec8369b3f1fb70900d29b1c4a1dc8b.tar.gz kernel-qcow2-linux-0e29d163f7ec8369b3f1fb70900d29b1c4a1dc8b.tar.xz kernel-qcow2-linux-0e29d163f7ec8369b3f1fb70900d29b1c4a1dc8b.zip | |
drbd: Reworked the unconfiguring and thread stopping code
* Moved CONFIG_PENDING and DEVICE_DYING from mdev to tconn.
* Renamed drbd_reconfig_start() and drbd_reconfig_done() to
conn_reconfig_start() and conn_reconfig_done().
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 0c3a094f6911..66080e204086 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3932,14 +3932,14 @@ static void drbdd(struct drbd_tconn *tconn) } } -void drbd_flush_workqueue(struct drbd_conf *mdev) +void conn_flush_workqueue(struct drbd_tconn *tconn) { struct drbd_wq_barrier barr; barr.w.cb = w_prev_work_done; - barr.w.mdev = mdev; + barr.w.tconn = tconn; init_completion(&barr.done); - drbd_queue_work(&mdev->tconn->data.work, &barr.w); + drbd_queue_work(&tconn->data.work, &barr.w); wait_for_completion(&barr.done); } |