From: Lars Ellenberg Date: Tue, 6 Apr 2010 12:15:06 +0000 (+0200) Subject: drbd: fail_requests_early: remove incorrect and unnecessary optimization X-Git-Tag: v2.6.35-rc1~442^2~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=979f5c7f1f6c8a532b943defb790d43b999934eb;p=platform%2Fupstream%2Fkernel-adaptation-pc.git 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: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index de81ab7..d8d9bbf 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -962,11 +962,6 @@ fail_and_free_req: */ 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)) {