drbd: disambiguation, s/DISCARD_CONCURRENT/RESOLVE_CONFLICTS/

We don't discard anything here, really.
We resolve conflicting, concurrent writes to overlapping data blocks.

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_int.h b/drivers/block/drbd/drbd_int.h
index 91b73247f65d..813f50dbe5ca 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -799,7 +799,7 @@ extern struct fifo_buffer *fifo_alloc(int fifo_size);
 /* flag bits per tconn */
 enum {
         NET_CONGESTED,          /* The data socket is congested */
-        DISCARD_CONCURRENT,     /* Set on one node, cleared on the peer! */
+        RESOLVE_CONFLICTS,      /* Set on one node, cleared on the peer! */
         SEND_PING,              /* whether asender should send a ping asap */
         SIGNAL_ASENDER,         /* whether asender wants to be interrupted */
         GOT_PING_ACK,           /* set when we receive a ping_ack packet, ping_wait gets woken */