diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2012-08-01 12:43:01 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-09 14:05:49 +0100 |
| commit | 427c0434fc52f15bd762ddc6611e874df6cc5b8d (patch) | |
| tree | 5d83c132fd0809884f5199a48ec6bbb9c7690ece /drivers/block/drbd/drbd_int.h | |
| parent | d4dabbe22d38752674c582e5bb40716a72397355 (diff) | |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 2 |
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 */ |