summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_int.h
diff options
context:
space:
mode:
authorPhilipp Reisner2011-02-07 14:35:25 +0100
committerPhilipp Reisner2011-09-28 10:26:55 +0200
commit25703f832000393721641772a827469d46b1105b (patch)
tree867d8456011ce4474e571c94233b35b1f9f8bfbd /drivers/block/drbd/drbd_int.h
parentdrbd: Started to separated connection flags (tconn) from block device flags (... (diff)
downloadkernel-qcow2-linux-25703f832000393721641772a827469d46b1105b.tar.gz
kernel-qcow2-linux-25703f832000393721641772a827469d46b1105b.tar.xz
kernel-qcow2-linux-25703f832000393721641772a827469d46b1105b.zip
drbd: Moved DISCARD_CONCURRENT to the per connection (tconn) flags
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index f46571acd4d0..2b8566362b78 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -763,7 +763,6 @@ enum {
UNPLUG_QUEUED, /* only relevant with kernel 2.4 */
UNPLUG_REMOTE, /* sending a "UnplugRemote" could help */
MD_DIRTY, /* current uuids and flags not yet on disk */
- DISCARD_CONCURRENT, /* Set on one node, cleared on the peer! */
USE_DEGR_WFC_T, /* degr-wfc-timeout instead of wfc-timeout. */
CLUSTER_ST_CHANGE, /* Cluster wide state change going on... */
CL_ST_CHG_SUCCESS,
@@ -911,6 +910,7 @@ struct fifo_buffer {
/* flag bits per tconn */
enum {
NET_CONGESTED, /* The data socket is congested */
+ DISCARD_CONCURRENT, /* Set on one node, cleared on the peer! */
};
struct drbd_tconn { /* is a resource from the config file */