diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 02:44:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 02:44:30 -0700 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/block/drbd/drbd_int.h | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
| download | lwn-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.gz lwn-4a1032faac94ebbf647460ae3e06fc21146eb280.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index d9301e861d9f..e5e86a781820 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -261,6 +261,9 @@ static inline const char *cmdname(enum drbd_packets cmd) [P_OV_REQUEST] = "OVRequest", [P_OV_REPLY] = "OVReply", [P_OV_RESULT] = "OVResult", + [P_CSUM_RS_REQUEST] = "CsumRSRequest", + [P_RS_IS_IN_SYNC] = "CsumRSIsInSync", + [P_COMPRESSED_BITMAP] = "CBitmap", [P_MAX_CMD] = NULL, }; @@ -443,13 +446,18 @@ struct p_rs_param_89 { char csums_alg[SHARED_SECRET_MAX]; } __packed; +enum drbd_conn_flags { + CF_WANT_LOSE = 1, + CF_DRY_RUN = 2, +}; + struct p_protocol { struct p_header head; u32 protocol; u32 after_sb_0p; u32 after_sb_1p; u32 after_sb_2p; - u32 want_lose; + u32 conn_flags; u32 two_primaries; /* Since protocol version 87 and higher. */ @@ -791,6 +799,8 @@ enum { * while this is set. */ RESIZE_PENDING, /* Size change detected locally, waiting for the response from * the peer, if it changed there as well. */ + CONN_DRY_RUN, /* Expect disconnect after resync handshake. */ + GOT_PING_ACK, /* set when we receive a ping_ack packet, misc wait gets woken */ }; struct drbd_bitmap; /* opaque for drbd_conf */ |