diff options
| author | Philipp Reisner | 2012-07-31 11:22:58 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-08-16 17:14:45 +0200 |
| commit | 509fc019e534bdf5f3969d78c53184db4cf7ff48 (patch) | |
| tree | 2db80b5650709fd1e0a538506a3e94007a273b3c /drivers/block/drbd/drbd_req.c | |
| parent | drbd: fix drbd wire compatibility for empty flushes (diff) | |
| download | kernel-qcow2-linux-509fc019e534bdf5f3969d78c53184db4cf7ff48.tar.gz kernel-qcow2-linux-509fc019e534bdf5f3969d78c53184db4cf7ff48.tar.xz kernel-qcow2-linux-509fc019e534bdf5f3969d78c53184db4cf7ff48.zip | |
drbd: Finish requests that completed while IO was frozen
Requests of an acked epoch are stored on the barrier_acked_requests list. In
case the private bio of such a request completes while IO on the drbd device
is suspended [req_mod(completed_ok)] then the request stays there.
When thawing IO because the fence_peer handler returned, then we use
tl_clear() to apply the connection_lost_while_pending event to all requests
on the transfer-log and the barrier_acked_requests list.
Up to now the connection_lost_while_pending event was not applied
on requests on the barrier_acked_requests list. Fixed that.
I.e. now the connection_lost_while_pending and resend events are
applied to requests on the barrier_acked_requests list. For that
it is necessary that the resend event finishes (local only)
READS correctly.
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 0bb1e41f136f..01b2ac641c7b 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -695,6 +695,12 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, break; case resend: + /* Simply complete (local only) READs. */ + if (!(req->rq_state & RQ_WRITE) && !req->w.cb) { + _req_may_be_done(req, m); + break; + } + /* If RQ_NET_OK is already set, we got a P_WRITE_ACK or P_RECV_ACK before the connection loss (B&C only); only P_BARRIER_ACK was missing. Trowing them out of the TL here by pretending we got a BARRIER_ACK |