From: Philipp Reisner Date: Tue, 13 Dec 2011 10:36:57 +0000 (+0100) Subject: drbd: Consider that read requests could be NEG_ACKEDed X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e8cdc3433568a1741e95c1d4412a7fb9736d0eac;p=deliverable%2Flinux.git drbd: Consider that read requests could be NEG_ACKEDed ap_in_flight only counts writes. NEG_ACKED is an action on a request that might be called for reads and writes. This bug was there forever, but it becomes much more relevant with the read balincing code. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index b1957d6c8bf5..cf3c10e23c50 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -628,7 +628,8 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, /* assert something? */ if (req->rq_state & RQ_NET_PENDING) { dec_ap_pending(mdev); - atomic_sub(req->i.size >> 9, &mdev->ap_in_flight); + if (req->rq_state & RQ_WRITE) + atomic_sub(req->i.size >> 9, &mdev->ap_in_flight); } req->rq_state &= ~(RQ_NET_OK|RQ_NET_PENDING);