drbd: fail_requests_early: remove incorrect and unnecessary optimization
authorLars Ellenberg <lars.ellenberg@linbit.com>
Tue, 6 Apr 2010 12:15:06 +0000 (14:15 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Mon, 17 May 2010 23:10:31 +0000 (01:10 +0200)
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 <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_req.c

index de81ab7..d8d9bbf 100644 (file)
@@ -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)) {