summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-03-24 16:07:04 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-05-18 01:17:47 +0200
commit6495d2c6d04f4c45411fdb1b40527c24015f39d6 (patch)
treecb7262a4b4750bb0fba045f492ffedbf8eef6701 /include
parentb4ee79dac3bddc468e21cae0deb00b80ec4ac051 (diff)
downloadblackbird-op-linux-6495d2c6d04f4c45411fdb1b40527c24015f39d6.tar.gz
blackbird-op-linux-6495d2c6d04f4c45411fdb1b40527c24015f39d6.zip
drbd: Implemented the --assume-clean option for drbdsetup resize
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/drbd.h3
-rw-r--r--include/linux/drbd_nl.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 4341b1a97a34..7944dd36ee3e 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -56,7 +56,7 @@ extern const char *drbd_buildtag(void);
#define REL_VERSION "8.3.7"
#define API_VERSION 88
#define PRO_VERSION_MIN 86
-#define PRO_VERSION_MAX 92
+#define PRO_VERSION_MAX 93
enum drbd_io_error_p {
@@ -139,6 +139,7 @@ enum drbd_ret_codes {
ERR_DATA_NOT_CURRENT = 150,
ERR_CONNECTED = 151, /* DRBD 8.3 only */
ERR_PERM = 152,
+ ERR_NEED_APV_93 = 153,
/* insert new ones above this line */
AFTER_LAST_ERR_CODE
diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
index f7431a4ca608..de055c07c2ba 100644
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
@@ -71,6 +71,7 @@ NL_PACKET(disconnect, 6, )
NL_PACKET(resize, 7,
NL_INT64( 29, T_MAY_IGNORE, resize_size)
NL_BIT( 68, T_MAY_IGNORE, resize_force)
+ NL_BIT( 69, T_MANDATORY, no_resync)
)
NL_PACKET(syncer_conf, 8,
OpenPOWER on IntegriCloud