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_main.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_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 85d95ec405ef..328ce80fecfa 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -3339,7 +3339,7 @@ const char *cmdname(enum drbd_packet cmd) [P_RECV_ACK] = "RecvAck", [P_WRITE_ACK] = "WriteAck", [P_RS_WRITE_ACK] = "RSWriteAck", - [P_DISCARD_WRITE] = "DiscardWrite", + [P_SUPERSEDED] = "Superseded", [P_NEG_ACK] = "NegAck", [P_NEG_DREPLY] = "NegDReply", [P_NEG_RS_DREPLY] = "NegRSDReply", |