diff options
| author |   Philipp Reisner <philipp.reisner@linbit.com> | 2013-03-27 14:08:36 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2013-03-28 10:10:24 -0600 |
| commit | 9376d9f8b97f20df5d30c83713652c3118b31534 (patch) | |
| tree | 279e6afef66121afe7dc86564fb3249ae7b36ab8 /drivers/block/drbd/drbd_state.c | |
| parent | drbd: abort start of resync early, if it raced with connection breakage (diff) | |
| download | linux-dev-9376d9f8b97f20df5d30c83713652c3118b31534.tar.xz linux-dev-9376d9f8b97f20df5d30c83713652c3118b31534.zip | |
drbd: move invalidating the whole bitmap out of after_state ch()
To avoid other state change requests, after passing through
sanitize_state(), to be mistaken for an invalidate,
move the "set all bits as out-of-sync" into the invalidate path.
Make invalidate and invalidate-remote behave consistently wrt.
current connection state (need either an established replication link,
or really be disconnected). Also mention that in the documentation.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 0fe220cfb9e9..3bc686f48b53 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1377,13 +1377,6 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, &drbd_bmio_set_n_write, &abw_start_sync, "set_n_write from StartingSync", BM_LOCKED_TEST_ALLOWED); - /* We are invalidating our self... */ - if (os.conn < C_CONNECTED && ns.conn < C_CONNECTED && - os.disk > D_INCONSISTENT && ns.disk == D_INCONSISTENT) - /* other bitmap operation expected during this phase */ - drbd_queue_bitmap_io(mdev, &drbd_bmio_set_n_write, NULL, - "set_n_write from invalidate", BM_LOCKED_MASK); - /* first half of local IO error, failure to attach, * or administrative detach */ if (os.disk != D_FAILED && ns.disk == D_FAILED) { |