drbd: Move drbd_send_ping() and drbd_send_ping_ack() to drbd_main.c (e307f352) · Commits · 戴 / test

drivers/block/drbd/drbd_int.h

+2 −11

Original line number	Diff line number	Diff line
		@@ -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)

+12 −0

Original line number	Diff line number	Diff line
		@@ -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;