diff options
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 485ed8c7d623..352441b0f92f 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -550,12 +550,6 @@ struct p_delay_probe { | |||
550 | u32 offset; /* usecs the probe got sent after the reference time point */ | 550 | u32 offset; /* usecs the probe got sent after the reference time point */ |
551 | } __packed; | 551 | } __packed; |
552 | 552 | ||
553 | struct delay_probe { | ||
554 | struct list_head list; | ||
555 | unsigned int seq_num; | ||
556 | struct timeval time; | ||
557 | }; | ||
558 | |||
559 | /* DCBP: Drbd Compressed Bitmap Packet ... */ | 553 | /* DCBP: Drbd Compressed Bitmap Packet ... */ |
560 | static inline enum drbd_bitmap_code | 554 | static inline enum drbd_bitmap_code |
561 | DCBP_get_code(struct p_compressed_bm *p) | 555 | DCBP_get_code(struct p_compressed_bm *p) |
@@ -942,11 +936,9 @@ struct drbd_conf { | |||
942 | unsigned int ko_count; | 936 | unsigned int ko_count; |
943 | struct drbd_work resync_work, | 937 | struct drbd_work resync_work, |
944 | unplug_work, | 938 | unplug_work, |
945 | md_sync_work, | 939 | md_sync_work; |
946 | delay_probe_work; | ||
947 | struct timer_list resync_timer; | 940 | struct timer_list resync_timer; |
948 | struct timer_list md_sync_timer; | 941 | struct timer_list md_sync_timer; |
949 | struct timer_list delay_probe_timer; | ||
950 | 942 | ||
951 | /* Used after attach while negotiating new disk state. */ | 943 | /* Used after attach while negotiating new disk state. */ |
952 | union drbd_state new_state_tmp; | 944 | union drbd_state new_state_tmp; |
@@ -1062,12 +1054,6 @@ struct drbd_conf { | |||
1062 | u64 ed_uuid; /* UUID of the exposed data */ | 1054 | u64 ed_uuid; /* UUID of the exposed data */ |
1063 | struct mutex state_mutex; | 1055 | struct mutex state_mutex; |
1064 | char congestion_reason; /* Why we where congested... */ | 1056 | char congestion_reason; /* Why we where congested... */ |
1065 | struct list_head delay_probes; /* protected by peer_seq_lock */ | ||
1066 | int data_delay; /* Delay of packets on the data-sock behind meta-sock */ | ||
1067 | unsigned int delay_seq; /* To generate sequence numbers of delay probes */ | ||
1068 | struct timeval dps_time; /* delay-probes-start-time */ | ||
1069 | unsigned int dp_volume_last; /* send_cnt of last delay probe */ | ||
1070 | int c_sync_rate; /* current resync rate after delay_probe magic */ | ||
1071 | }; | 1057 | }; |
1072 | 1058 | ||
1073 | static inline struct drbd_conf *minor_to_mdev(unsigned int minor) | 1059 | static inline struct drbd_conf *minor_to_mdev(unsigned int minor) |