From 4da53d9b4f19bb684a1f4a2eada87dac5394248a Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Mon, 26 Mar 2012 16:51:11 +0200 Subject: [PATCH] --- yaml --- r: 346179 b: refs/heads/master c: 0afd569a40323b8b50bcf553cf9c0fbca9c9e229 h: refs/heads/master i: 346177: 7f92f792e601de411793f199dc87c5aa4a37413b 346175: d2abf8c7c50e561ffaa9b1e762c4a2e2b6177f6e v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 1f6226d67961..e21a6de45516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea9d6729bd0f90126e910c31cf64ecb5074f43a7 +refs/heads/master: 0afd569a40323b8b50bcf553cf9c0fbca9c9e229 diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index 771f29c80438..938a57bf73c1 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -587,28 +587,23 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, } break; - case WRITE_ACKED_BY_PEER_AND_SIS: - req->rq_state |= RQ_NET_SIS; case DISCARD_WRITE: /* for discarded conflicting writes of multiple primaries, * there is no need to keep anything in the tl, potential * node crashes are covered by the activity log. */ req->rq_state |= RQ_NET_DONE; /* fall through */ + case WRITE_ACKED_BY_PEER_AND_SIS: case WRITE_ACKED_BY_PEER: + if (what == WRITE_ACKED_BY_PEER_AND_SIS) + req->rq_state |= RQ_NET_SIS; D_ASSERT(req->rq_state & RQ_EXP_WRITE_ACK); /* protocol C; successfully written on peer. - * Nothing to do here. + * Nothing more to do here. * We want to keep the tl in place for all protocols, to cater - * for volatile write-back caches on lower level devices. - * - * A barrier request is expected to have forced all prior - * requests onto stable storage, so completion of a barrier - * request could set NET_DONE right here, and not wait for the - * P_BARRIER_ACK, but that is an unnecessary optimization. */ + * for volatile write-back caches on lower level devices. */ goto ack_common; - /* this makes it effectively the same as for: */ case RECV_ACKED_BY_PEER: D_ASSERT(req->rq_state & RQ_EXP_RECEIVE_ACK); /* protocol B; pretends to be successfully written on peer.