diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2016-06-14 00:26:28 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-13 21:43:06 -0600 |
| commit | af61494ad4725ed78bd6b3f159a32463d80fdd60 (patch) | |
| tree | 3eeabe42412659fed1a41bcf60aadefd77157d45 /drivers/block | |
| parent | 0ead5cca3dd8c6433172ab3dee320246372efb0d (diff) | |
| download | linux-stable-af61494ad4725ed78bd6b3f159a32463d80fdd60.tar.gz linux-stable-af61494ad4725ed78bd6b3f159a32463d80fdd60.tar.bz2 linux-stable-af61494ad4725ed78bd6b3f159a32463d80fdd60.zip | |
drbd: only restart frozen disk io when D_UP_TO_DATE
When re-attaching the local backend device to a C_STANDALONE D_DISKLESS
R_PRIMARY with OND_SUSPEND_IO, we may only resume IO if we recognize the
backend that is being attached as D_UP_TO_DATE.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 59c646752af8..24422e85ad3c 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1675,7 +1675,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, what = RESEND; if ((os.disk == D_ATTACHING || os.disk == D_NEGOTIATING) && - conn_lowest_disk(connection) > D_NEGOTIATING) + conn_lowest_disk(connection) == D_UP_TO_DATE) what = RESTART_FROZEN_DISK_IO; if (resource->susp_nod && what != NOTHING) { |