Commit af61494a authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe

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: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 0ead5cca
...@@ -1675,7 +1675,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os, ...@@ -1675,7 +1675,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os,
what = RESEND; what = RESEND;
if ((os.disk == D_ATTACHING || os.disk == D_NEGOTIATING) && 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; what = RESTART_FROZEN_DISK_IO;
if (resource->susp_nod && what != NOTHING) { if (resource->susp_nod && what != NOTHING) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment