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

Commit 979f5c7f authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: fail_requests_early: remove incorrect and unnecessary optimization 



The condition does not fit the commend (I may well be Primary,
even if I lost the disk earlier and now the connection).

And this is catched below anyways, where it also gets logged.

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

drivers/block/drbd/drbd_req.c

+0 −5
Original line number Diff line number Diff line
@@ -962,11 +962,6 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio) 
 */

static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write)

{

	/* Unconfigured */

	if (mdev->state.conn == C_DISCONNECTING &&

	    mdev->state.disk == D_DISKLESS)

		return 1;



	if (mdev->state.role != R_PRIMARY &&

		(!allow_oos || is_write)) {

		if (__ratelimit(&drbd_ratelimit_state)) {