summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-01-14 19:20:34 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 11:45:34 +0100
commit71c78cfba232de8f61a4b1bbb6e876424d133407 (patch)
tree2875a4f478f328d57a148dcd01b9563053447fd2 /drivers/block
parent4a23f2649698272abcd9e0c9a992d65739f32792 (diff)
downloadop-kernel-dev-71c78cfba232de8f61a4b1bbb6e876424d133407.zip
op-kernel-dev-71c78cfba232de8f61a4b1bbb6e876424d133407.tar.gz
drbd: Nothing should stop SyncSource -> Ahead transitions
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index a3f6b04..6f9d1bf 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1002,7 +1002,7 @@ allocate_barrier:
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
OpenPOWER on IntegriCloud