drbd: Fixes to the new delay_probes code

* Only send delay_probes with protocol 93 or newer
* drbd_send_delay_probes() is called only from worker context,
  no atomic_t needed for delay_seq

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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 37380d2c869d..45d9a4534c40 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -552,7 +552,7 @@ struct p_delay_probe {
 
 struct delay_probe {
         struct list_head list;
-        int seq_num;
+        unsigned int seq_num;
         struct timeval time;
 };
 
@@ -1048,9 +1048,9 @@ struct drbd_conf {
         char congestion_reason;  /* Why we where congested... */
         struct list_head delay_probes; /* protected by peer_seq_lock */
         int data_delay;   /* Delay of packets on the data-sock behind meta-sock */
-        atomic_t delay_seq; /* To generate sequence numbers of delay probes */
+        unsigned int delay_seq; /* To generate sequence numbers of delay probes */
         struct timeval dps_time; /* delay-probes-start-time */
-        int dp_volume_last;  /* send_cnt of last delay probe */
+        unsigned int dp_volume_last;  /* send_cnt of last delay probe */
         int c_sync_rate; /* current resync rate after delay_probe magic */
 };