From 1b3c8ba13de42a958cb21f2da3930cf01d011877 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Fri, 14 Jan 2011 19:20:34 +0100 Subject: [PATCH] --- yaml --- r: 242889 b: refs/heads/master c: 71c78cfba232de8f61a4b1bbb6e876424d133407 h: refs/heads/master i: 242887: 36090d976e91c844c8007de060c9afd3a6ed041b v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bbed1342f31c..3b2f9687f82d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a23f2649698272abcd9e0c9a992d65739f32792 +refs/heads/master: 71c78cfba232de8f61a4b1bbb6e876424d133407 diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index a3f6b04ebaba..6f9d1bfcca58 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -1002,7 +1002,7 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio, uns congested = 1; } - if (congested && atomic_read(&mdev->rs_pending_cnt) == 0) { + if (congested) { /* rs_pending_cnt must be zero, otherwise the two peers might get different bitmaps. With sane configurations the resync stalls long before we might want to go into