summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorLars Ellenberg2012-08-07 06:47:14 +0200
committerPhilipp Reisner2012-11-09 14:05:48 +0100
commit46e21bbadb2f4770199f2343f311f8833e5bf495 (patch)
tree4214c97cdd9e65effd4df11760b7342c64a8f920 /drivers/block/drbd/drbd_req.c
parentdrbd: only start a new epoch, if the current epoch contains writes (diff)
downloadkernel-qcow2-linux-46e21bbadb2f4770199f2343f311f8833e5bf495.tar.gz
kernel-qcow2-linux-46e21bbadb2f4770199f2343f311f8833e5bf495.tar.xz
kernel-qcow2-linux-46e21bbadb2f4770199f2343f311f8833e5bf495.zip
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 <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_req.c')
-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 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: