diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-05-06 15:19:30 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-05-18 01:28:08 +0200 |
| commit | 162f3ec7f026784ff2e216f19147d67e2f8ccd56 (patch) | |
| tree | ef211a8348dc4862da7ce21c315aed2e37e8de7b /drivers/block/drbd/drbd_int.h | |
| parent | a8cdfd8d3bf0b6d2bbe792f5e74f54ccc6bc1d4f (diff) | |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 37380d2c869..45d9a4534c4 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 */ }; |