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

Commit 79f16f5d authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Consider that the no-data-condition could be in connected state 



...when the peer has inconsistent data. In that case we failed to
clear the susp_nod flag. When the local disk was attached again

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent bca482e9

drivers/block/drbd/drbd_main.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1412,7 +1412,8 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, 
		if (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED)

		if (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED)

			what = resend;

			what = resend;





		if (os.disk == D_ATTACHING && ns.disk > D_ATTACHING)

		if ((os.disk == D_ATTACHING || os.disk == D_NEGOTIATING) &&

		    ns.disk > D_NEGOTIATING)

			what = restart_frozen_disk_io;

			what = restart_frozen_disk_io;





		if (what != nothing)

		if (what != nothing)