drbd: Removed redundant error checks in the request code path
authorPhilipp Reisner <philipp.reisner@linbit.com>
Mon, 10 May 2010 14:03:10 +0000 (16:03 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 14 Oct 2010 12:39:38 +0000 (14:39 +0200)
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 39c2cc3..4864758 100644 (file)
@@ -984,21 +984,6 @@ static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write)
                return 1;
        }
 
-       /*
-        * Paranoia: we might have been primary, but sync target, or
-        * even diskless, then lost the connection.
-        * This should have been handled (panic? suspend?) somewhere
-        * else. But maybe it was not, so check again here.
-        * Caution: as long as we do not have a read/write lock on mdev,
-        * to serialize state changes, this is racy, since we may lose
-        * the connection *after* we test for the cstate.
-        */
-       if (mdev->state.disk < D_UP_TO_DATE && mdev->state.pdsk < D_UP_TO_DATE) {
-               if (__ratelimit(&drbd_ratelimit_state))
-                       dev_err(DEV, "Sorry, I have no access to good data anymore.\n");
-               return 1;
-       }
-
        return 0;
 }