diff options
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 81030d8d654b..b2699bb2e530 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -622,7 +622,7 @@ DCBP_set_pad_bits(struct p_compressed_bm *p, int n) | |||
622 | /* one bitmap packet, including the p_header, | 622 | /* one bitmap packet, including the p_header, |
623 | * should fit within one _architecture independend_ page. | 623 | * should fit within one _architecture independend_ page. |
624 | * so we need to use the fixed size 4KiB page size | 624 | * so we need to use the fixed size 4KiB page size |
625 | * most architechtures have used for a long time. | 625 | * most architectures have used for a long time. |
626 | */ | 626 | */ |
627 | #define BM_PACKET_PAYLOAD_BYTES (4096 - sizeof(struct p_header80)) | 627 | #define BM_PACKET_PAYLOAD_BYTES (4096 - sizeof(struct p_header80)) |
628 | #define BM_PACKET_WORDS (BM_PACKET_PAYLOAD_BYTES/sizeof(long)) | 628 | #define BM_PACKET_WORDS (BM_PACKET_PAYLOAD_BYTES/sizeof(long)) |
@@ -810,7 +810,7 @@ enum { | |||
810 | 810 | ||
811 | /* global flag bits */ | 811 | /* global flag bits */ |
812 | enum { | 812 | enum { |
813 | CREATE_BARRIER, /* next P_DATA is preceeded by a P_BARRIER */ | 813 | CREATE_BARRIER, /* next P_DATA is preceded by a P_BARRIER */ |
814 | SIGNAL_ASENDER, /* whether asender wants to be interrupted */ | 814 | SIGNAL_ASENDER, /* whether asender wants to be interrupted */ |
815 | SEND_PING, /* whether asender should send a ping asap */ | 815 | SEND_PING, /* whether asender should send a ping asap */ |
816 | 816 | ||
@@ -1126,7 +1126,7 @@ struct drbd_conf { | |||
1126 | int c_sync_rate; /* current resync rate after syncer throttle magic */ | 1126 | int c_sync_rate; /* current resync rate after syncer throttle magic */ |
1127 | struct fifo_buffer rs_plan_s; /* correction values of resync planer */ | 1127 | struct fifo_buffer rs_plan_s; /* correction values of resync planer */ |
1128 | int rs_in_flight; /* resync sectors in flight (to proxy, in proxy and from proxy) */ | 1128 | int rs_in_flight; /* resync sectors in flight (to proxy, in proxy and from proxy) */ |
1129 | int rs_planed; /* resync sectors already planed */ | 1129 | int rs_planed; /* resync sectors already planned */ |
1130 | atomic_t ap_in_flight; /* App sectors in flight (waiting for ack) */ | 1130 | atomic_t ap_in_flight; /* App sectors in flight (waiting for ack) */ |
1131 | }; | 1131 | }; |
1132 | 1132 | ||
@@ -1144,7 +1144,7 @@ static inline unsigned int mdev_to_minor(struct drbd_conf *mdev) | |||
1144 | return mdev->minor; | 1144 | return mdev->minor; |
1145 | } | 1145 | } |
1146 | 1146 | ||
1147 | /* returns 1 if it was successfull, | 1147 | /* returns 1 if it was successful, |
1148 | * returns 0 if there was no data socket. | 1148 | * returns 0 if there was no data socket. |
1149 | * so wherever you are going to use the data.socket, e.g. do | 1149 | * so wherever you are going to use the data.socket, e.g. do |
1150 | * if (!drbd_get_data_sock(mdev)) | 1150 | * if (!drbd_get_data_sock(mdev)) |
@@ -2079,7 +2079,7 @@ static inline void inc_ap_pending(struct drbd_conf *mdev) | |||
2079 | /* counts how many resync-related answers we still expect from the peer | 2079 | /* counts how many resync-related answers we still expect from the peer |
2080 | * increase decrease | 2080 | * increase decrease |
2081 | * C_SYNC_TARGET sends P_RS_DATA_REQUEST (and expects P_RS_DATA_REPLY) | 2081 | * C_SYNC_TARGET sends P_RS_DATA_REQUEST (and expects P_RS_DATA_REPLY) |
2082 | * C_SYNC_SOURCE sends P_RS_DATA_REPLY (and expects P_WRITE_ACK whith ID_SYNCER) | 2082 | * C_SYNC_SOURCE sends P_RS_DATA_REPLY (and expects P_WRITE_ACK with ID_SYNCER) |
2083 | * (or P_NEG_ACK with ID_SYNCER) | 2083 | * (or P_NEG_ACK with ID_SYNCER) |
2084 | */ | 2084 | */ |
2085 | static inline void inc_rs_pending(struct drbd_conf *mdev) | 2085 | static inline void inc_rs_pending(struct drbd_conf *mdev) |