Merge branch 'master' of git://1984.lsi.us.es/nf

[mirror_ubuntu-bionic-kernel.git] / include / linux / drbd.h

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 1e9f754b66acf0beba8a4466cade5751aed12f6f..0c5a18ec322ce2b1ef963d8364d868adc3a82f98 100644 (file)
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -52,10 +52,10 @@
 #endif
 
 extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.3.11"
-#define API_VERSION 88
+#define REL_VERSION "8.4.2"
+#define API_VERSION 1
 #define PRO_VERSION_MIN 86
-#define PRO_VERSION_MAX 100
+#define PRO_VERSION_MAX 101
 
 
 enum drbd_io_error_p {
@@ -102,6 +102,20 @@ enum drbd_on_congestion {
        OC_DISCONNECT,
 };
 
+enum drbd_read_balancing {
+       RB_PREFER_LOCAL,
+       RB_PREFER_REMOTE,
+       RB_ROUND_ROBIN,
+       RB_LEAST_PENDING,
+       RB_CONGESTED_REMOTE,
+       RB_32K_STRIPING,
+       RB_64K_STRIPING,
+       RB_128K_STRIPING,
+       RB_256K_STRIPING,
+       RB_512K_STRIPING,
+       RB_1M_STRIPING,
+};
+
 /* KEEP the order, do not delete or insert. Only append. */
 enum drbd_ret_code {
        ERR_CODE_BASE           = 100,
@@ -122,7 +136,7 @@ enum drbd_ret_code {
        ERR_AUTH_ALG            = 120,
        ERR_AUTH_ALG_ND         = 121,
        ERR_NOMEM               = 122,
-       ERR_DISCARD             = 123,
+       ERR_DISCARD_IMPOSSIBLE  = 123,
        ERR_DISK_CONFIGURED     = 124,
        ERR_NET_CONFIGURED      = 125,
        ERR_MANDATORY_TAG       = 126,
@@ -324,6 +338,7 @@ extern const char *drbd_set_st_err_str(enum drbd_state_rv);
 #define MDF_PEER_OUT_DATED     (1 << 5)
 #define MDF_CRASHED_PRIMARY    (1 << 6)
 #define MDF_AL_CLEAN           (1 << 7)
+#define MDF_AL_DISABLED                (1 << 8)
 
 enum drbd_uuid_index {
        UI_CURRENT,