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>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 85d95ec405e..328ce80fecf 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",