From: Lars Ellenberg Date: Tue, 7 Aug 2012 04:47:14 +0000 (+0200) Subject: drbd: NEG_ACK does not imply a barrier-ack X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=46e21bbadb2f4770199f2343f311f8833e5bf495;p=linux-beck.git drbd: NEG_ACK does not imply a barrier-ack Don't drop a request from the transfer log just because it was NEG_ACKED. We need it around to be able to verify P_BARRIER_ACKs against the transver log. 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 0c1b6327e207..67768570141a 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -660,7 +660,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, break; case NEG_ACKED: - mod_rq_state(req, m, RQ_NET_OK|RQ_NET_PENDING, RQ_NET_DONE); + mod_rq_state(req, m, RQ_NET_OK|RQ_NET_PENDING, 0); break; case FAIL_FROZEN_DISK_IO: