From a8d278d7d64f57c36327febc8e01e960f52bd428 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Tue, 13 Dec 2011 11:36:57 +0100 Subject: [PATCH] --- yaml --- r: 346153 b: refs/heads/master c: e8cdc3433568a1741e95c1d4412a7fb9736d0eac h: refs/heads/master i: 346151: fea2c8e95eb4fef89d54cc661debe0c4712afb0a v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a4b80df6213..61b31f7c5f12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ab9b1b60b1854bf5fe68ecd51cb9550c67801ec +refs/heads/master: e8cdc3433568a1741e95c1d4412a7fb9736d0eac diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index b1957d6c8bf5..cf3c10e23c50 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/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);