Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/block/drbd/drbd_state.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {