projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 99b4d8f)
drbd: NEG_ACK does not imply a barrier-ack
authorLars Ellenberg <lars.ellenberg@linbit.com>
Tue, 7 Aug 2012 04:47:14 +0000 (06:47 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 9 Nov 2012 13:05:48 +0000 (14:05 +0100)
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>
drivers/block/drbd/drbd_req.c patch | blob | blame | history

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 0c1b6327e2077d23577f79693e7cc9ad4915a94a..67768570141a547c576e3592b626c1e97b831648 100644 (file)
--- 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: