diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2012-03-26 16:51:11 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:58:23 +0100 |
| commit | 0afd569a40323b8b50bcf553cf9c0fbca9c9e229 (patch) | |
| tree | 90f7094b50510ab58f1ec0ddcd7243cec9a49353 /drivers/block/drbd/drbd_req.c | |
| parent | drbd: fix READ_RETRY_REMOTE_CANCELED to not complete if device is suspended (diff) | |
| download | linux-0afd569a40323b8b50bcf553cf9c0fbca9c9e229.tar.xz linux-0afd569a40323b8b50bcf553cf9c0fbca9c9e229.zip | |
drbd: fix WRITE_ACKED_BY_PEER_AND_SIS to not set RQ_NET_DONE
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.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 771f29c80438..938a57bf73c1 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/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. |