drbd: revert "delay probes", feature is being re-implemented differently

It was a now abandoned attempt to throttle resync bandwidth
based on the delay it causes on the bulk data socket.
It has no userbase yet, and has been disabled by
9173465ccb51c09cc3102a10af93e9f469a0af6f already.
This removes the now unused code.

The basic feature, namely using up "idle" bandwith
of network and disk IO subsystem, with minimal impact
to application IO, is being reimplemented differently.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index b8d2516668a..479ee3a1d90 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -53,7 +53,7 @@
 
 
 extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.3.8"
+#define REL_VERSION "8.3.8.1"
 #define API_VERSION 88
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 94
diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
index ce77a746fc9..5f042810a56 100644
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
@@ -78,10 +78,11 @@ NL_PACKET(syncer_conf, 8,
         NL_INTEGER(     30,     T_MAY_IGNORE,   rate)
         NL_INTEGER(     31,     T_MAY_IGNORE,   after)
         NL_INTEGER(     32,     T_MAY_IGNORE,   al_extents)
-        NL_INTEGER(     71,     T_MAY_IGNORE,   dp_volume)
-        NL_INTEGER(     72,     T_MAY_IGNORE,   dp_interval)
-        NL_INTEGER(     73,     T_MAY_IGNORE,   throttle_th)
-        NL_INTEGER(     74,     T_MAY_IGNORE,   hold_off_th)
+/*      NL_INTEGER(     71,     T_MAY_IGNORE,   dp_volume)
+ *      NL_INTEGER(     72,     T_MAY_IGNORE,   dp_interval)
+ *      NL_INTEGER(     73,     T_MAY_IGNORE,   throttle_th)
+ *      NL_INTEGER(     74,     T_MAY_IGNORE,   hold_off_th)
+ * feature will be reimplemented differently with 8.3.9 */
         NL_STRING(      52,     T_MAY_IGNORE,   verify_alg,     SHARED_SECRET_MAX)
         NL_STRING(      51,     T_MAY_IGNORE,   cpu_mask,       32)
         NL_STRING(      64,     T_MAY_IGNORE,   csums_alg,      SHARED_SECRET_MAX)