diff --git a/[refs] b/[refs] index 14b77a718e54..b4c0d5e8ffb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6666032ade5a758aa05380ab92f416ab8ef25005 +refs/heads/master: 979f5c7f1f6c8a532b943defb790d43b999934eb diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index de81ab7b4627..d8d9bbfca3b8 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -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)) {