From e307f352b4a6b4411136acd8cab20f9259ba182a Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Tue, 22 Mar 2011 10:55:48 +0100 Subject: [PATCH] drbd: Move drbd_send_ping() and drbd_send_ping_ack() to drbd_main.c Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- drivers/block/drbd/drbd_int.h | 13 ++----------- drivers/block/drbd/drbd_main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 3a046e418aa4..4f0cafa18870 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1939,17 +1939,8 @@ static inline int drbd_send_short_cmd(struct drbd_conf *mdev, return drbd_send_cmd(mdev, &mdev->tconn->data, cmd, &h, sizeof(h)); } -static inline int drbd_send_ping(struct drbd_tconn *tconn) -{ - struct p_header h; - return !conn_send_cmd(tconn, 0, &tconn->meta, P_PING, &h, sizeof(h)); -} - -static inline int drbd_send_ping_ack(struct drbd_tconn *tconn) -{ - struct p_header h; - return !conn_send_cmd(tconn, 0, &tconn->meta, P_PING_ACK, &h, sizeof(h)); -} +extern int drbd_send_ping(struct drbd_tconn *tconn); +extern int drbd_send_ping_ack(struct drbd_tconn *tconn); static inline int drbd_send_state_req(struct drbd_conf *mdev, union drbd_state mask, union drbd_state val) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index a1deab6f1309..d9828612c8e8 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -765,6 +765,18 @@ int conn_send_cmd2(struct drbd_tconn *tconn, enum drbd_packet cmd, char *data, return err; } +int drbd_send_ping(struct drbd_tconn *tconn) +{ + struct p_header h; + return !conn_send_cmd(tconn, 0, &tconn->meta, P_PING, &h, sizeof(h)); +} + +int drbd_send_ping_ack(struct drbd_tconn *tconn) +{ + struct p_header h; + return !conn_send_cmd(tconn, 0, &tconn->meta, P_PING_ACK, &h, sizeof(h)); +} + int drbd_send_sync_param(struct drbd_conf *mdev) { struct p_rs_param_95 *p;