aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2011-04-24 20:52:20 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:49:05 +0100
commitf5e2b8b3b6bed8c60103b4ed5341af072129d7c0 (patch)
tree11dde69cbbead3461ba2d8588a72a1def929b7e3
parentae25b336e0e00eafd61f1cc1c3e9e1c0d2b8fc51 (diff)
downloadvexpress-lsk-f5e2b8b3b6bed8c60103b4ed5341af072129d7c0.tar.gz
drbd: move comment about stopping the receiver thread to where it belongs
When the last volume of a replication group is unconfigured, the worker thread exits. To not interfere with cleanup of other threads, before the the last cleanups run, we need to make sure the receiver has already exited. The commend explaining that clearly belongs above drbd_thread_stop(&tconn->receiver), not in the cleanup loop below. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r--drivers/block/drbd/drbd_worker.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 2c43cf0918c..9d1ba8ea681 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -1744,12 +1744,13 @@ int drbd_worker(struct drbd_thread *thi)
*/
spin_unlock_irq(&tconn->data.work.q_lock);
+ /* _drbd_set_state only uses stop_nowait.
+ * wait here for the exiting receiver. */
drbd_thread_stop(&tconn->receiver);
+
down_read(&drbd_cfg_rwsem);
idr_for_each_entry(&tconn->volumes, mdev, vnr) {
D_ASSERT(mdev->state.disk == D_DISKLESS && mdev->state.conn == C_STANDALONE);
- /* _drbd_set_state only uses stop_nowait.
- * wait here for the exiting receiver. */
drbd_mdev_cleanup(mdev);
}
up_read(&drbd_cfg_rwsem);