diff options
| author | Lars Ellenberg | 2012-08-01 12:33:51 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-09 14:05:49 +0100 |
| commit | d4dabbe22d38752674c582e5bb40716a72397355 (patch) | |
| tree | 51a89e48ba52a80fa93b3c37390e5b772a2b7bb8 /drivers/block/drbd/drbd_req.c | |
| parent | drbd: cleanup, drop unused struct (diff) | |
| download | kernel-qcow2-linux-d4dabbe22d38752674c582e5bb40716a72397355.tar.gz kernel-qcow2-linux-d4dabbe22d38752674c582e5bb40716a72397355.tar.xz kernel-qcow2-linux-d4dabbe22d38752674c582e5bb40716a72397355.zip | |
drbd: disambiguation, s/P_DISCARD_WRITE/P_SUPERSEDED/
To avoid confusion with REQ_DISCARD aka TRIM, rename our
"discard concurrent write acks" from P_DISCARD_WRITE to P_SUPERSEDED.
At the same time, rename the drbd request event DISCARD_WRITE
to CONFLICT_RESOLVED. It already triggers both successful completion
or restart of the request, depending on our RQ_POSTPONED flag.
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, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 67768570141a..266ef24b3c74 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -611,13 +611,13 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, RQ_NET_DONE); break; - case DISCARD_WRITE: - /* for discarded conflicting writes of multiple primaries, + case CONFLICT_RESOLVED: + /* for superseded conflicting writes of multiple primaries, * there is no need to keep anything in the tl, potential * node crashes are covered by the activity log. * * If this request had been marked as RQ_POSTPONED before, - * it will actually not be discarded, but "restarted", + * it will actually not be completed, but "restarted", * resubmitted from the retry worker context. */ D_ASSERT(req->rq_state & RQ_NET_PENDING); D_ASSERT(req->rq_state & RQ_EXP_WRITE_ACK); |