aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-04-06 08:15:06 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-05-17 19:10:31 -0400
commit979f5c7f1f6c8a532b943defb790d43b999934eb (patch)
tree64799998f0e104595281c32101218452736296fa /drivers/block
parent6666032ade5a758aa05380ab92f416ab8ef25005 (diff)
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.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index de81ab7b462..d8d9bbfca3b 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -962,11 +962,6 @@ fail_and_free_req:
962 */ 962 */
963static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write) 963static int drbd_fail_request_early(struct drbd_conf *mdev, int is_write)
964{ 964{
965 /* Unconfigured */
966 if (mdev->state.conn == C_DISCONNECTING &&
967 mdev->state.disk == D_DISKLESS)
968 return 1;
969
970 if (mdev->state.role != R_PRIMARY && 965 if (mdev->state.role != R_PRIMARY &&
971 (!allow_oos || is_write)) { 966 (!allow_oos || is_write)) {
972 if (__ratelimit(&drbd_ratelimit_state)) { 967 if (__ratelimit(&drbd_ratelimit_state)) {