aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_int.h
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-03-15 13:40:27 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-03 19:16:27 -0400
commit8169e41b3e59ee74a31270804a1b5ccef9ae9fce (patch)
tree3a4d9065937bb7645bf7737660c07a58aa6f1a2e /drivers/block/drbd/drbd_int.h
parent38fa9988fa838324a0cce6e2f9d3c674230659d5 (diff)
drbd: Moved CONN_DRY_RUN 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 278e7acc7f32..d6e7e657e7a4 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -791,7 +791,6 @@ enum {
791 RESYNC_AFTER_NEG, /* Resync after online grow after the attach&negotiate finished. */ 791 RESYNC_AFTER_NEG, /* Resync after online grow after the attach&negotiate finished. */
792 RESIZE_PENDING, /* Size change detected locally, waiting for the response from 792 RESIZE_PENDING, /* Size change detected locally, waiting for the response from
793 * the peer, if it changed there as well. */ 793 * the peer, if it changed there as well. */
794 CONN_DRY_RUN, /* Expect disconnect after resync handshake. */
795 NEW_CUR_UUID, /* Create new current UUID when thawing IO */ 794 NEW_CUR_UUID, /* Create new current UUID when thawing IO */
796 AL_SUSPENDED, /* Activity logging is currently suspended. */ 795 AL_SUSPENDED, /* Activity logging is currently suspended. */
797 AHEAD_TO_SYNC_SOURCE, /* Ahead -> SyncSource queued */ 796 AHEAD_TO_SYNC_SOURCE, /* Ahead -> SyncSource queued */
@@ -915,6 +914,7 @@ enum {
915 * but worker thread is still handling the cleanup. 914 * but worker thread is still handling the cleanup.
916 * reconfiguring (nl_disk_conf, nl_net_conf) is dissalowed, 915 * reconfiguring (nl_disk_conf, nl_net_conf) is dissalowed,
917 * while this is set. */ 916 * while this is set. */
917 CONN_DRY_RUN, /* Expect disconnect after resync handshake. */
918}; 918};
919 919
920struct drbd_tconn { /* is a resource from the config file */ 920struct drbd_tconn { /* is a resource from the config file */