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

Commit 3fb4746d 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 97af09d5

drivers/block/drbd/drbd_state.c

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

			what = RESEND;



		if (os.disk == D_ATTACHING && conn_lowest_disk(mdev->tconn) > D_ATTACHING)

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

		    conn_lowest_disk(mdev->tconn) > D_NEGOTIATING)

			what = RESTART_FROZEN_DISK_IO;



		if (what != NOTHING) {