Skip to content

L
linux
Commit d8763023 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files
Options

drbd: Rename "enum drbd_packets" to "enum drbd_packet" 

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent f2ad9063
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 83 deletions
drivers/block/drbd/drbd_int.h
View file @ d8763023
...@@ -159,7 +159,7 @@ extern struct drbd_conf **minor_table; ...@@ -159,7 +159,7 @@ extern struct drbd_conf **minor_table;
extern struct ratelimit_state drbd_ratelimit_state; extern struct ratelimit_state drbd_ratelimit_state;
/* on the wire */ /* on the wire */
enum drbd_packets { enum drbd_packet {
/* receiver (data socket) */ /* receiver (data socket) */
P_DATA = 0x00, P_DATA = 0x00,
P_DATA_REPLY = 0x01, /* Response to P_DATA_REQUEST */ P_DATA_REPLY = 0x01, /* Response to P_DATA_REQUEST */
...@@ -221,7 +221,7 @@ enum drbd_packets { ...@@ -221,7 +221,7 @@ enum drbd_packets {
P_HAND_SHAKE = 0xfffe /* FIXED for the next century! */ P_HAND_SHAKE = 0xfffe /* FIXED for the next century! */
}; };
extern const char *cmdname(enum drbd_packets cmd); extern const char *cmdname(enum drbd_packet cmd);
/* for sending/receiving the bitmap, /* for sending/receiving the bitmap,
* possibly in some encoding scheme */ * possibly in some encoding scheme */
...@@ -1189,36 +1189,34 @@ extern int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply, enum dds_f ...@@ -1189,36 +1189,34 @@ extern int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply, enum dds_f
extern int _drbd_send_state(struct drbd_conf *mdev); extern int _drbd_send_state(struct drbd_conf *mdev);
extern int drbd_send_state(struct drbd_conf *mdev); extern int drbd_send_state(struct drbd_conf *mdev);
extern int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock, extern int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock,
enum drbd_packets cmd, struct p_header *h, enum drbd_packet cmd, struct p_header *h,
size_t size, unsigned msg_flags); size_t size, unsigned msg_flags);
#define USE_DATA_SOCKET 1 #define USE_DATA_SOCKET 1
#define USE_META_SOCKET 0 #define USE_META_SOCKET 0
extern int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket, extern int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket,
enum drbd_packets cmd, struct p_header *h, enum drbd_packet cmd, struct p_header *h, size_t size);
size_t size); extern int drbd_send_cmd2(struct drbd_conf *mdev, enum drbd_packet cmd,
extern int drbd_send_cmd2(struct drbd_conf *mdev, enum drbd_packets cmd,
char *data, size_t size); char *data, size_t size);
extern int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc); extern int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc);
extern int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, extern int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr,
u32 set_size); u32 set_size);
extern int drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd, extern int drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
struct drbd_epoch_entry *e); struct drbd_epoch_entry *e);
extern int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packets cmd, extern int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packet cmd,
struct p_block_req *rp); struct p_block_req *rp);
extern int drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packets cmd, extern int drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packet cmd,
struct p_data *dp, int data_size); struct p_data *dp, int data_size);
extern int drbd_send_ack_ex(struct drbd_conf *mdev, enum drbd_packets cmd, extern int drbd_send_ack_ex(struct drbd_conf *mdev, enum drbd_packet cmd,
sector_t sector, int blksize, u64 block_id); sector_t sector, int blksize, u64 block_id);
extern int drbd_send_oos(struct drbd_conf *mdev, struct drbd_request *req); extern int drbd_send_oos(struct drbd_conf *mdev, struct drbd_request *req);
extern int drbd_send_block(struct drbd_conf *mdev, enum drbd_packets cmd, extern int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd,
struct drbd_epoch_entry *e); struct drbd_epoch_entry *e);
extern int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req); extern int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req);
extern int drbd_send_drequest(struct drbd_conf *mdev, int cmd, extern int drbd_send_drequest(struct drbd_conf *mdev, int cmd,
sector_t sector, int size, u64 block_id); sector_t sector, int size, u64 block_id);
extern int drbd_send_drequest_csum(struct drbd_conf *mdev, extern int drbd_send_drequest_csum(struct drbd_conf *mdev, sector_t sector,
sector_t sector,int size, int size, void *digest, int digest_size,
void *digest, int digest_size, enum drbd_packet cmd);
enum drbd_packets cmd);
extern int drbd_send_ov_request(struct drbd_conf *mdev,sector_t sector,int size); extern int drbd_send_ov_request(struct drbd_conf *mdev,sector_t sector,int size);
extern int drbd_send_bitmap(struct drbd_conf *mdev); extern int drbd_send_bitmap(struct drbd_conf *mdev);
...@@ -1961,7 +1959,7 @@ static inline void request_ping(struct drbd_conf *mdev) ...@@ -1961,7 +1959,7 @@ static inline void request_ping(struct drbd_conf *mdev)
} }
static inline int drbd_send_short_cmd(struct drbd_conf *mdev, static inline int drbd_send_short_cmd(struct drbd_conf *mdev,
enum drbd_packets cmd) enum drbd_packet cmd)
{ {
struct p_header h; struct p_header h;
return drbd_send_cmd(mdev, USE_DATA_SOCKET, cmd, &h, sizeof(h)); return drbd_send_cmd(mdev, USE_DATA_SOCKET, cmd, &h, sizeof(h));
......
drivers/block/drbd/drbd_main.c
View file @ d8763023
...@@ -1821,7 +1821,7 @@ void drbd_thread_current_set_cpu(struct drbd_conf *mdev) ...@@ -1821,7 +1821,7 @@ void drbd_thread_current_set_cpu(struct drbd_conf *mdev)
#endif #endif
static void prepare_header80(struct drbd_conf *mdev, struct p_header80 *h, static void prepare_header80(struct drbd_conf *mdev, struct p_header80 *h,
enum drbd_packets cmd, int size) enum drbd_packet cmd, int size)
{ {
h->magic = cpu_to_be32(DRBD_MAGIC); h->magic = cpu_to_be32(DRBD_MAGIC);
h->command = cpu_to_be16(cmd); h->command = cpu_to_be16(cmd);
...@@ -1829,7 +1829,7 @@ static void prepare_header80(struct drbd_conf *mdev, struct p_header80 *h, ...@@ -1829,7 +1829,7 @@ static void prepare_header80(struct drbd_conf *mdev, struct p_header80 *h,
} }
static void prepare_header95(struct drbd_conf *mdev, struct p_header95 *h, static void prepare_header95(struct drbd_conf *mdev, struct p_header95 *h,
enum drbd_packets cmd, int size) enum drbd_packet cmd, int size)
{ {
h->magic = cpu_to_be16(DRBD_MAGIC_BIG); h->magic = cpu_to_be16(DRBD_MAGIC_BIG);
h->command = cpu_to_be16(cmd); h->command = cpu_to_be16(cmd);
...@@ -1837,7 +1837,7 @@ static void prepare_header95(struct drbd_conf *mdev, struct p_header95 *h, ...@@ -1837,7 +1837,7 @@ static void prepare_header95(struct drbd_conf *mdev, struct p_header95 *h,
} }
static void prepare_header(struct drbd_conf *mdev, struct p_header *h, static void prepare_header(struct drbd_conf *mdev, struct p_header *h,
enum drbd_packets cmd, int size) enum drbd_packet cmd, int size)
{ {
if (mdev->tconn->agreed_pro_version >= 100 || size > DRBD_MAX_SIZE_H80_PACKET) if (mdev->tconn->agreed_pro_version >= 100 || size > DRBD_MAX_SIZE_H80_PACKET)
prepare_header95(mdev, &h->h95, cmd, size); prepare_header95(mdev, &h->h95, cmd, size);
...@@ -1847,8 +1847,8 @@ static void prepare_header(struct drbd_conf *mdev, struct p_header *h, ...@@ -1847,8 +1847,8 @@ static void prepare_header(struct drbd_conf *mdev, struct p_header *h,
/* the appropriate socket mutex must be held already */ /* the appropriate socket mutex must be held already */
int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock, int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock,
enum drbd_packets cmd, struct p_header *h, enum drbd_packet cmd, struct p_header *h, size_t size,
size_t size, unsigned msg_flags) unsigned msg_flags)
{ {
int sent, ok; int sent, ok;
...@@ -1872,7 +1872,7 @@ int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock, ...@@ -1872,7 +1872,7 @@ int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock,
* when we hold the appropriate socket mutex. * when we hold the appropriate socket mutex.
*/ */
int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket, int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket,
enum drbd_packets cmd, struct p_header *h, size_t size) enum drbd_packet cmd, struct p_header *h, size_t size)
{ {
int ok = 0; int ok = 0;
struct socket *sock; struct socket *sock;
...@@ -1897,7 +1897,7 @@ int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket, ...@@ -1897,7 +1897,7 @@ int drbd_send_cmd(struct drbd_conf *mdev, int use_data_socket,
return ok; return ok;
} }
int drbd_send_cmd2(struct drbd_conf *mdev, enum drbd_packets cmd, char *data, int drbd_send_cmd2(struct drbd_conf *mdev, enum drbd_packet cmd, char *data,
size_t size) size_t size)
{ {
struct p_header h; struct p_header h;
...@@ -1938,7 +1938,8 @@ int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc) ...@@ -1938,7 +1938,8 @@ int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc)
sock = mdev->tconn->data.socket; sock = mdev->tconn->data.socket;
if (likely(sock != NULL)) { if (likely(sock != NULL)) {
enum drbd_packets cmd = apv >= 89 ? P_SYNC_PARAM89 : P_SYNC_PARAM; enum drbd_packet cmd =
apv >= 89 ? P_SYNC_PARAM89 : P_SYNC_PARAM;
p = &mdev->tconn->data.sbuf.rs_param_95; p = &mdev->tconn->data.sbuf.rs_param_95;
...@@ -2391,10 +2392,8 @@ int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, u32 set_size) ...@@ -2391,10 +2392,8 @@ int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, u32 set_size)
* @blksize: size in byte, needs to be in big endian byte order * @blksize: size in byte, needs to be in big endian byte order
* @block_id: Id, big endian byte order * @block_id: Id, big endian byte order
*/ */
static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd, static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
u64 sector, u64 sector, u32 blksize, u64 block_id)
u32 blksize,
u64 block_id)
{ {
int ok; int ok;
struct p_block_ack p; struct p_block_ack p;
...@@ -2413,7 +2412,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd, ...@@ -2413,7 +2412,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
/* dp->sector and dp->block_id already/still in network byte order, /* dp->sector and dp->block_id already/still in network byte order,
* data_size is payload size according to dp->head, * data_size is payload size according to dp->head,
* and may need to be corrected for digest size. */ * and may need to be corrected for digest size. */
int drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packets cmd, int drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packet cmd,
struct p_data *dp, int data_size) struct p_data *dp, int data_size)
{ {
data_size -= (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->integrity_r_tfm) ? data_size -= (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->integrity_r_tfm) ?
...@@ -2422,7 +2421,7 @@ int drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packets cmd, ...@@ -2422,7 +2421,7 @@ int drbd_send_ack_dp(struct drbd_conf *mdev, enum drbd_packets cmd,
dp->block_id); dp->block_id);
} }
int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packets cmd, int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packet cmd,
struct p_block_req *rp) struct p_block_req *rp)
{ {
return _drbd_send_ack(mdev, cmd, rp->sector, rp->blksize, rp->block_id); return _drbd_send_ack(mdev, cmd, rp->sector, rp->blksize, rp->block_id);
...@@ -2434,8 +2433,8 @@ int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packets cmd, ...@@ -2434,8 +2433,8 @@ int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packets cmd,
* @cmd: Packet command code. * @cmd: Packet command code.
* @e: Epoch entry. * @e: Epoch entry.
*/ */
int drbd_send_ack(struct drbd_conf *mdev, int drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
enum drbd_packets cmd, struct drbd_epoch_entry *e) struct drbd_epoch_entry *e)
{ {
return _drbd_send_ack(mdev, cmd, return _drbd_send_ack(mdev, cmd,
cpu_to_be64(e->i.sector), cpu_to_be64(e->i.sector),
...@@ -2445,7 +2444,7 @@ int drbd_send_ack(struct drbd_conf *mdev, ...@@ -2445,7 +2444,7 @@ int drbd_send_ack(struct drbd_conf *mdev,
/* This function misuses the block_id field to signal if the blocks /* This function misuses the block_id field to signal if the blocks
* are is sync or not. */ * are is sync or not. */
int drbd_send_ack_ex(struct drbd_conf *mdev, enum drbd_packets cmd, int drbd_send_ack_ex(struct drbd_conf *mdev, enum drbd_packet cmd,
sector_t sector, int blksize, u64 block_id) sector_t sector, int blksize, u64 block_id)
{ {
return _drbd_send_ack(mdev, cmd, return _drbd_send_ack(mdev, cmd,
...@@ -2468,10 +2467,8 @@ int drbd_send_drequest(struct drbd_conf *mdev, int cmd, ...@@ -2468,10 +2467,8 @@ int drbd_send_drequest(struct drbd_conf *mdev, int cmd,
return ok; return ok;
} }
int drbd_send_drequest_csum(struct drbd_conf *mdev, int drbd_send_drequest_csum(struct drbd_conf *mdev, sector_t sector, int size,
sector_t sector, int size, void *digest, int digest_size, enum drbd_packet cmd)
void *digest, int digest_size,
enum drbd_packets cmd)
{ {
int ok; int ok;
struct p_block_req p; struct p_block_req p;
...@@ -2742,7 +2739,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) ...@@ -2742,7 +2739,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
* Peer -> (diskless) R_PRIMARY (P_DATA_REPLY) * Peer -> (diskless) R_PRIMARY (P_DATA_REPLY)
* C_SYNC_SOURCE -> C_SYNC_TARGET (P_RS_DATA_REPLY) * C_SYNC_SOURCE -> C_SYNC_TARGET (P_RS_DATA_REPLY)
*/ */
int drbd_send_block(struct drbd_conf *mdev, enum drbd_packets cmd, int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd,
struct drbd_epoch_entry *e) struct drbd_epoch_entry *e)
{ {
int ok; int ok;
...@@ -4101,7 +4098,7 @@ static int w_md_sync(struct drbd_conf *mdev, struct drbd_work *w, int unused) ...@@ -4101,7 +4098,7 @@ static int w_md_sync(struct drbd_conf *mdev, struct drbd_work *w, int unused)
return 1; return 1;
} }
const char *cmdname(enum drbd_packets cmd) const char *cmdname(enum drbd_packet cmd)
{ {
/* THINK may need to become several global tables /* THINK may need to become several global tables
* when we want to support more than * when we want to support more than
......
drivers/block/drbd/drbd_receiver.c
View file @ d8763023
...@@ -697,15 +697,16 @@ static struct socket *drbd_wait_for_connect(struct drbd_conf *mdev) ...@@ -697,15 +697,16 @@ static struct socket *drbd_wait_for_connect(struct drbd_conf *mdev)
return s_estab; return s_estab;
} }
static int drbd_send_fp(struct drbd_conf *mdev, static int drbd_send_fp(struct drbd_conf *mdev, struct socket *sock,
struct socket *sock, enum drbd_packets cmd) enum drbd_packet cmd)
{ {
struct p_header *h = &mdev->tconn->data.sbuf.header; struct p_header *h = &mdev->tconn->data.sbuf.header;
return _drbd_send_cmd(mdev, sock, cmd, h, sizeof(*h), 0); return _drbd_send_cmd(mdev, sock, cmd, h, sizeof(*h), 0);
} }
static enum drbd_packets drbd_recv_fp(struct drbd_conf *mdev, struct socket *sock) static enum drbd_packet drbd_recv_fp(struct drbd_conf *mdev,
struct socket *sock)
{ {
struct p_header80 *h = &mdev->tconn->data.rbuf.header.h80; struct p_header80 *h = &mdev->tconn->data.rbuf.header.h80;
int rr; int rr;
...@@ -926,8 +927,8 @@ static int drbd_connect(struct drbd_conf *mdev) ...@@ -926,8 +927,8 @@ static int drbd_connect(struct drbd_conf *mdev)
return -1; return -1;
} }
static bool decode_header(struct drbd_conf *mdev, struct p_header *h, enum drbd_packets *cmd, static bool decode_header(struct drbd_conf *mdev, struct p_header *h,
unsigned int *packet_size) enum drbd_packet *cmd, unsigned int *packet_size)
{ {
if (h->h80.magic == cpu_to_be32(DRBD_MAGIC)) { if (h->h80.magic == cpu_to_be32(DRBD_MAGIC)) {
*cmd = be16_to_cpu(h->h80.command); *cmd = be16_to_cpu(h->h80.command);
...@@ -945,7 +946,8 @@ static bool decode_header(struct drbd_conf *mdev, struct p_header *h, enum drbd_ ...@@ -945,7 +946,8 @@ static bool decode_header(struct drbd_conf *mdev, struct p_header *h, enum drbd_
return true; return true;
} }
static int drbd_recv_header(struct drbd_conf *mdev, enum drbd_packets *cmd, unsigned int *packet_size) static int drbd_recv_header(struct drbd_conf *mdev, enum drbd_packet *cmd,
unsigned int *packet_size)
{ {
struct p_header *h = &mdev->tconn->data.rbuf.header; struct p_header *h = &mdev->tconn->data.rbuf.header;
int r; int r;
...@@ -1170,7 +1172,8 @@ int drbd_submit_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e, ...@@ -1170,7 +1172,8 @@ int drbd_submit_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e,
return err; return err;
} }
static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
int rv; int rv;
struct p_barrier *p = &mdev->tconn->data.rbuf.barrier; struct p_barrier *p = &mdev->tconn->data.rbuf.barrier;
...@@ -1499,7 +1502,8 @@ find_request(struct drbd_conf *mdev, struct rb_root *root, u64 id, ...@@ -1499,7 +1502,8 @@ find_request(struct drbd_conf *mdev, struct rb_root *root, u64 id,
return NULL; return NULL;
} }
static int receive_DataReply(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_DataReply(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct drbd_request *req; struct drbd_request *req;
sector_t sector; sector_t sector;
...@@ -1528,7 +1532,8 @@ static int receive_DataReply(struct drbd_conf *mdev, enum drbd_packets cmd, unsi ...@@ -1528,7 +1532,8 @@ static int receive_DataReply(struct drbd_conf *mdev, enum drbd_packets cmd, unsi
return ok; return ok;
} }
static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
sector_t sector; sector_t sector;
int ok; int ok;
...@@ -1681,7 +1686,8 @@ static unsigned long wire_flags_to_bio(struct drbd_conf *mdev, u32 dpf) ...@@ -1681,7 +1686,8 @@ static unsigned long wire_flags_to_bio(struct drbd_conf *mdev, u32 dpf)
} }
/* mirrored write */ /* mirrored write */
static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_Data(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
sector_t sector; sector_t sector;
struct drbd_epoch_entry *e; struct drbd_epoch_entry *e;
...@@ -1966,7 +1972,8 @@ int drbd_rs_should_slow_down(struct drbd_conf *mdev, sector_t sector) ...@@ -1966,7 +1972,8 @@ int drbd_rs_should_slow_down(struct drbd_conf *mdev, sector_t sector)
} }
static int receive_DataRequest(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int digest_size) static int receive_DataRequest(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int digest_size)
{ {
sector_t sector; sector_t sector;
const sector_t capacity = drbd_get_capacity(mdev->this_bdev); const sector_t capacity = drbd_get_capacity(mdev->this_bdev);
...@@ -2691,7 +2698,8 @@ static int cmp_after_sb(enum drbd_after_sb_p peer, enum drbd_after_sb_p self) ...@@ -2691,7 +2698,8 @@ static int cmp_after_sb(enum drbd_after_sb_p peer, enum drbd_after_sb_p self)
return 1; return 1;
} }
static int receive_protocol(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_protocol(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct p_protocol *p = &mdev->tconn->data.rbuf.protocol; struct p_protocol *p = &mdev->tconn->data.rbuf.protocol;
int p_proto, p_after_sb_0p, p_after_sb_1p, p_after_sb_2p; int p_proto, p_after_sb_0p, p_after_sb_1p, p_after_sb_2p;
...@@ -2790,7 +2798,8 @@ struct crypto_hash *drbd_crypto_alloc_digest_safe(const struct drbd_conf *mdev, ...@@ -2790,7 +2798,8 @@ struct crypto_hash *drbd_crypto_alloc_digest_safe(const struct drbd_conf *mdev,
return tfm; return tfm;
} }
static int receive_SyncParam(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int packet_size) static int receive_SyncParam(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int packet_size)
{ {
int ok = true; int ok = true;
struct p_rs_param_95 *p = &mdev->tconn->data.rbuf.rs_param_95; struct p_rs_param_95 *p = &mdev->tconn->data.rbuf.rs_param_95;
...@@ -2954,7 +2963,8 @@ static void warn_if_differ_considerably(struct drbd_conf *mdev, ...@@ -2954,7 +2963,8 @@ static void warn_if_differ_considerably(struct drbd_conf *mdev,
(unsigned long long)a, (unsigned long long)b); (unsigned long long)a, (unsigned long long)b);
} }
static int receive_sizes(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_sizes(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct p_sizes *p = &mdev->tconn->data.rbuf.sizes; struct p_sizes *p = &mdev->tconn->data.rbuf.sizes;
enum determine_dev_size dd = unchanged; enum determine_dev_size dd = unchanged;
...@@ -3057,7 +3067,8 @@ static int receive_sizes(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned ...@@ -3057,7 +3067,8 @@ static int receive_sizes(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
return true; return true;
} }
static int receive_uuids(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_uuids(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct p_uuids *p = &mdev->tconn->data.rbuf.uuids; struct p_uuids *p = &mdev->tconn->data.rbuf.uuids;
u64 *p_uuid; u64 *p_uuid;
...@@ -3151,7 +3162,8 @@ static union drbd_state convert_state(union drbd_state ps) ...@@ -3151,7 +3162,8 @@ static union drbd_state convert_state(union drbd_state ps)
return ms; return ms;
} }
static int receive_req_state(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_req_state(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct p_req_state *p = &mdev->tconn->data.rbuf.req_state; struct p_req_state *p = &mdev->tconn->data.rbuf.req_state;
union drbd_state mask, val; union drbd_state mask, val;
...@@ -3177,7 +3189,8 @@ static int receive_req_state(struct drbd_conf *mdev, enum drbd_packets cmd, unsi ...@@ -3177,7 +3189,8 @@ static int receive_req_state(struct drbd_conf *mdev, enum drbd_packets cmd, unsi
return true; return true;
} }
static int receive_state(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_state(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct p_state *p = &mdev->tconn->data.rbuf.state; struct p_state *p = &mdev->tconn->data.rbuf.state;
union drbd_state os, ns, peer_state; union drbd_state os, ns, peer_state;
...@@ -3329,7 +3342,8 @@ static int receive_state(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned ...@@ -3329,7 +3342,8 @@ static int receive_state(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
return true; return true;
} }
static int receive_sync_uuid(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_sync_uuid(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct p_rs_uuid *p = &mdev->tconn->data.rbuf.rs_uuid; struct p_rs_uuid *p = &mdev->tconn->data.rbuf.rs_uuid;
...@@ -3525,7 +3539,8 @@ void INFO_bm_xfer_stats(struct drbd_conf *mdev, ...@@ -3525,7 +3539,8 @@ void INFO_bm_xfer_stats(struct drbd_conf *mdev,
in order to be agnostic to the 32 vs 64 bits issue. in order to be agnostic to the 32 vs 64 bits issue.
returns 0 on failure, 1 if we successfully received it. */ returns 0 on failure, 1 if we successfully received it. */
static int receive_bitmap(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_bitmap(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct bm_xfer_ctx c; struct bm_xfer_ctx c;
void *buffer; void *buffer;
...@@ -3616,7 +3631,8 @@ static int receive_bitmap(struct drbd_conf *mdev, enum drbd_packets cmd, unsigne ...@@ -3616,7 +3631,8 @@ static int receive_bitmap(struct drbd_conf *mdev, enum drbd_packets cmd, unsigne
return ok; return ok;
} }
static int receive_skip(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_skip(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
/* TODO zero copy sink :) */ /* TODO zero copy sink :) */
static char sink[128]; static char sink[128];
...@@ -3636,7 +3652,8 @@ static int receive_skip(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned ...@@ -3636,7 +3652,8 @@ static int receive_skip(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
return size == 0; return size == 0;
} }
static int receive_UnplugRemote(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_UnplugRemote(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
/* Make sure we've acked all the TCP data associated /* Make sure we've acked all the TCP data associated
* with the data requests being unplugged */ * with the data requests being unplugged */
...@@ -3645,7 +3662,8 @@ static int receive_UnplugRemote(struct drbd_conf *mdev, enum drbd_packets cmd, u ...@@ -3645,7 +3662,8 @@ static int receive_UnplugRemote(struct drbd_conf *mdev, enum drbd_packets cmd, u
return true; return true;
} }
static int receive_out_of_sync(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned int data_size) static int receive_out_of_sync(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{ {
struct p_block_desc *p = &mdev->tconn->data.rbuf.block_desc; struct p_block_desc *p = &mdev->tconn->data.rbuf.block_desc;
...@@ -3664,7 +3682,8 @@ static int receive_out_of_sync(struct drbd_conf *mdev, enum drbd_packets cmd, un ...@@ -3664,7 +3682,8 @@ static int receive_out_of_sync(struct drbd_conf *mdev, enum drbd_packets cmd, un
return true; return true;
} }
typedef int (*drbd_cmd_handler_f)(struct drbd_conf *, enum drbd_packets cmd, unsigned int to_receive); typedef int (*drbd_cmd_handler_f)(struct drbd_conf *, enum drbd_packet cmd,
unsigned int to_receive);
struct data_cmd { struct data_cmd {
int expect_payload; int expect_payload;
...@@ -3711,7 +3730,7 @@ static void drbdd(struct drbd_conf *mdev) ...@@ -3711,7 +3730,7 @@ static void drbdd(struct drbd_conf *mdev)
{ {
struct p_header *header = &mdev->tconn->data.rbuf.header; struct p_header *header = &mdev->tconn->data.rbuf.header;
unsigned int packet_size; unsigned int packet_size;
enum drbd_packets cmd; enum drbd_packet cmd;
size_t shs; /* sub header size */ size_t shs; /* sub header size */
int rv; int rv;
...@@ -3938,7 +3957,7 @@ static int drbd_do_handshake(struct drbd_conf *mdev) ...@@ -3938,7 +3957,7 @@ static int drbd_do_handshake(struct drbd_conf *mdev)
struct p_handshake *p = &mdev->tconn->data.rbuf.handshake; struct p_handshake *p = &mdev->tconn->data.rbuf.handshake;
const int expect = sizeof(struct p_handshake) - sizeof(struct p_header80); const int expect = sizeof(struct p_handshake) - sizeof(struct p_header80);
unsigned int length; unsigned int length;
enum drbd_packets cmd; enum drbd_packet cmd;
int rv; int rv;
rv = drbd_send_handshake(mdev); rv = drbd_send_handshake(mdev);
...@@ -4019,7 +4038,7 @@ static int drbd_do_auth(struct drbd_conf *mdev) ...@@ -4019,7 +4038,7 @@ static int drbd_do_auth(struct drbd_conf *mdev)
unsigned int key_len = strlen(mdev->tconn->net_conf->shared_secret); unsigned int key_len = strlen(mdev->tconn->net_conf->shared_secret);
unsigned int resp_size; unsigned int resp_size;
struct hash_desc desc; struct hash_desc desc;
enum drbd_packets cmd; enum drbd_packet cmd;
unsigned int length; unsigned int length;
int rv; int rv;
...@@ -4191,7 +4210,7 @@ int drbdd_init(struct drbd_thread *thi) ...@@ -4191,7 +4210,7 @@ int drbdd_init(struct drbd_thread *thi)
/* ********* acknowledge sender ******** */ /* ********* acknowledge sender ******** */
static int got_RqSReply(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_RqSReply(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
struct p_req_state_reply *p = &mdev->tconn->meta.rbuf.req_state_reply; struct p_req_state_reply *p = &mdev->tconn->meta.rbuf.req_state_reply;
...@@ -4209,13 +4228,13 @@ static int got_RqSReply(struct drbd_conf *mdev, enum drbd_packets cmd) ...@@ -4209,13 +4228,13 @@ static int got_RqSReply(struct drbd_conf *mdev, enum drbd_packets cmd)
return true; return true;
} }
static int got_Ping(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_Ping(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
return drbd_send_ping_ack(mdev); return drbd_send_ping_ack(mdev);
} }
static int got_PingAck(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_PingAck(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
/* restore idle timeout */ /* restore idle timeout */
mdev->tconn->meta.socket->sk->sk_rcvtimeo = mdev->tconn->net_conf->ping_int*HZ; mdev->tconn->meta.socket->sk->sk_rcvtimeo = mdev->tconn->net_conf->ping_int*HZ;
...@@ -4225,7 +4244,7 @@ static int got_PingAck(struct drbd_conf *mdev, enum drbd_packets cmd) ...@@ -4225,7 +4244,7 @@ static int got_PingAck(struct drbd_conf *mdev, enum drbd_packets cmd)
return true; return true;
} }
static int got_IsInSync(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_IsInSync(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack; struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack;
sector_t sector = be64_to_cpu(p->sector); sector_t sector = be64_to_cpu(p->sector);
...@@ -4270,7 +4289,7 @@ validate_req_change_req_state(struct drbd_conf *mdev, u64 id, sector_t sector, ...@@ -4270,7 +4289,7 @@ validate_req_change_req_state(struct drbd_conf *mdev, u64 id, sector_t sector,
return true; return true;
} }
static int got_BlockAck(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_BlockAck(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack; struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack;
sector_t sector = be64_to_cpu(p->sector); sector_t sector = be64_to_cpu(p->sector);
...@@ -4311,7 +4330,7 @@ static int got_BlockAck(struct drbd_conf *mdev, enum drbd_packets cmd) ...@@ -4311,7 +4330,7 @@ static int got_BlockAck(struct drbd_conf *mdev, enum drbd_packets cmd)
what, false); what, false);
} }
static int got_NegAck(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_NegAck(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack; struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack;
sector_t sector = be64_to_cpu(p->sector); sector_t sector = be64_to_cpu(p->sector);
...@@ -4344,7 +4363,7 @@ static int got_NegAck(struct drbd_conf *mdev, enum drbd_packets cmd) ...@@ -4344,7 +4363,7 @@ static int got_NegAck(struct drbd_conf *mdev, enum drbd_packets cmd)
return true; return true;
} }
static int got_NegDReply(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_NegDReply(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack; struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack;
sector_t sector = be64_to_cpu(p->sector); sector_t sector = be64_to_cpu(p->sector);
...@@ -4358,7 +4377,7 @@ static int got_NegDReply(struct drbd_conf *mdev, enum drbd_packets cmd) ...@@ -4358,7 +4377,7 @@ static int got_NegDReply(struct drbd_conf *mdev, enum drbd_packets cmd)
NEG_ACKED, false); NEG_ACKED, false);
} }
static int got_NegRSDReply(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_NegRSDReply(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
sector_t sector; sector_t sector;
int size; int size;
...@@ -4389,7 +4408,7 @@ static int got_NegRSDReply(struct drbd_conf *mdev, enum drbd_packets cmd) ...@@ -4389,7 +4408,7 @@ static int got_NegRSDReply(struct drbd_conf *mdev, enum drbd_packets cmd)
return true; return true;
} }
static int got_BarrierAck(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_BarrierAck(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
struct p_barrier_ack *p = &mdev->tconn->meta.rbuf.barrier_ack; struct p_barrier_ack *p = &mdev->tconn->meta.rbuf.barrier_ack;
...@@ -4405,7 +4424,7 @@ static int got_BarrierAck(struct drbd_conf *mdev, enum drbd_packets cmd) ...@@ -4405,7 +4424,7 @@ static int got_BarrierAck(struct drbd_conf *mdev, enum drbd_packets cmd)
return true; return true;
} }
static int got_OVResult(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_OVResult(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack; struct p_block_ack *p = &mdev->tconn->meta.rbuf.block_ack;
struct drbd_work *w; struct drbd_work *w;
...@@ -4449,14 +4468,14 @@ static int got_OVResult(struct drbd_conf *mdev, enum drbd_packets cmd) ...@@ -4449,14 +4468,14 @@ static int got_OVResult(struct drbd_conf *mdev, enum drbd_packets cmd)
return true; return true;
} }
static int got_skip(struct drbd_conf *mdev, enum drbd_packets cmd) static int got_skip(struct drbd_conf *mdev, enum drbd_packet cmd)
{ {
return true; return true;
} }
struct asender_cmd { struct asender_cmd {
size_t pkt_size; size_t pkt_size;
int (*process)(struct drbd_conf *mdev, enum drbd_packets cmd); int (*process)(struct drbd_conf *mdev, enum drbd_packet cmd);
}; };
static struct asender_cmd *get_asender_cmd(int cmd) static struct asender_cmd *get_asender_cmd(int cmd)
...@@ -4499,7 +4518,7 @@ int drbd_asender(struct drbd_thread *thi) ...@@ -4499,7 +4518,7 @@ int drbd_asender(struct drbd_thread *thi)
int expect = sizeof(struct p_header); int expect = sizeof(struct p_header);
int ping_timeout_active = 0; int ping_timeout_active = 0;
int empty, pkt_size; int empty, pkt_size;
enum drbd_packets cmd_nr; enum drbd_packet cmd_nr;
sprintf(current->comm, "drbd%d_asender", mdev_to_minor(mdev)); sprintf(current->comm, "drbd%d_asender", mdev_to_minor(mdev));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7