diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2010-04-06 14:15:06 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-05-18 01:10:31 +0200 |
| commit | 979f5c7f1f6c8a532b943defb790d43b999934eb (patch) | |
| tree | 64799998f0e104595281c32101218452736296fa /drivers/block | |
| parent | 6666032ade5a758aa05380ab92f416ab8ef25005 (diff) | |
| download | talos-obmc-linux-979f5c7f1f6c8a532b943defb790d43b999934eb.tar.gz talos-obmc-linux-979f5c7f1f6c8a532b943defb790d43b999934eb.zip | |
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 <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index de81ab7b4627..d8d9bbfca3b8 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)) { |
