drbd: Allow packet handler functions that take a connection (meta connection)

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 704cb7087879f7828cb2d3cf8692ee8f4dc5299a..ba350bd562c698b610918d8996f9851961abd1ae 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -60,6 +60,11 @@ enum finish_epoch {
        FE_RECYCLED,
 };
 
+enum mdev_or_conn {
+       MDEV,
+       CONN,
+};
+
 static int drbd_do_handshake(struct drbd_tconn *tconn);
 static int drbd_do_auth(struct drbd_tconn *tconn);
 static int drbd_disconnected(int vnr, void *p, void *data);
@@ -3876,10 +3881,7 @@ static int receive_out_of_sync(struct drbd_conf *mdev, enum drbd_packet cmd,
 struct data_cmd {
        int expect_payload;
        size_t pkt_size;
-       enum {
-               MDEV,
-               CONN,
-       } type;
+       enum mdev_or_conn fa_type; /* first argument's type */
        union {
                int (*mdev_fn)(struct drbd_conf *, enum drbd_packet cmd,
                                  unsigned int to_receive);
@@ -3954,7 +3956,7 @@ static void drbdd(struct drbd_tconn *tconn)
                        }
                }
 
-               if (drbd_cmd_handler[pi.cmd].type == CONN) {
+               if (drbd_cmd_handler[pi.cmd].fa_type == CONN) {
                        rv = drbd_cmd_handler[pi.cmd].conn_fn(tconn, pi.cmd, pi.size - shs);
                } else {
                        struct drbd_conf *mdev = vnr_to_mdev(tconn, pi.vnr);
@@ -4719,27 +4721,31 @@ static int tconn_process_done_ee(struct drbd_tconn *tconn)
 
 struct asender_cmd {
        size_t pkt_size;
-       int (*process)(struct drbd_conf *, enum drbd_packet);
+       enum mdev_or_conn fa_type; /* first argument's type */
+       union {
+               int (*mdev_fn)(struct drbd_conf *mdev, enum drbd_packet cmd);
+               int (*conn_fn)(struct drbd_tconn *tconn, enum drbd_packet cmd);
+       };
 };
 
 static struct asender_cmd asender_tbl[] = {
-       [P_PING]            = { sizeof(struct p_header), got_Ping },
-       [P_PING_ACK]        = { sizeof(struct p_header), got_PingAck },
-       [P_RECV_ACK]        = { sizeof(struct p_block_ack), got_BlockAck },
-       [P_WRITE_ACK]       = { sizeof(struct p_block_ack), got_BlockAck },
-       [P_RS_WRITE_ACK]    = { sizeof(struct p_block_ack), got_BlockAck },
-       [P_DISCARD_WRITE]   = { sizeof(struct p_block_ack), got_BlockAck },
-       [P_NEG_ACK]         = { sizeof(struct p_block_ack), got_NegAck },
-       [P_NEG_DREPLY]      = { sizeof(struct p_block_ack), got_NegDReply },
-       [P_NEG_RS_DREPLY]   = { sizeof(struct p_block_ack), got_NegRSDReply},
-       [P_OV_RESULT]       = { sizeof(struct p_block_ack), got_OVResult },
-       [P_BARRIER_ACK]     = { sizeof(struct p_barrier_ack), got_BarrierAck },
-       [P_STATE_CHG_REPLY] = { sizeof(struct p_req_state_reply), got_RqSReply },
-       [P_RS_IS_IN_SYNC]   = { sizeof(struct p_block_ack), got_IsInSync },
-       [P_DELAY_PROBE]     = { sizeof(struct p_delay_probe93), got_skip },
-       [P_RS_CANCEL]       = { sizeof(struct p_block_ack), got_NegRSDReply},
-       [P_CONN_ST_CHG_REPLY]={ sizeof(struct p_req_state_reply), got_RqSReply },
-       [P_RETRY_WRITE]     = { sizeof(struct p_block_ack), got_BlockAck },
+       [P_PING]            = { sizeof(struct p_header), MDEV, { got_Ping } },
+       [P_PING_ACK]        = { sizeof(struct p_header), MDEV, { got_PingAck } },
+       [P_RECV_ACK]        = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
+       [P_WRITE_ACK]       = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
+       [P_RS_WRITE_ACK]    = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
+       [P_DISCARD_WRITE]   = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
+       [P_NEG_ACK]         = { sizeof(struct p_block_ack), MDEV, { got_NegAck } },
+       [P_NEG_DREPLY]      = { sizeof(struct p_block_ack), MDEV, { got_NegDReply } },
+       [P_NEG_RS_DREPLY]   = { sizeof(struct p_block_ack), MDEV, { got_NegRSDReply } },
+       [P_OV_RESULT]       = { sizeof(struct p_block_ack), MDEV, { got_OVResult } },
+       [P_BARRIER_ACK]     = { sizeof(struct p_barrier_ack), MDEV, { got_BarrierAck } },
+       [P_STATE_CHG_REPLY] = { sizeof(struct p_req_state_reply), MDEV, { got_RqSReply } },
+       [P_RS_IS_IN_SYNC]   = { sizeof(struct p_block_ack), MDEV, { got_IsInSync } },
+       [P_DELAY_PROBE]     = { sizeof(struct p_delay_probe93), MDEV, { got_skip } },
+       [P_RS_CANCEL]       = { sizeof(struct p_block_ack), MDEV, { got_NegRSDReply } },
+       [P_CONN_ST_CHG_REPLY]={ sizeof(struct p_req_state_reply), MDEV, { got_RqSReply } },
+       [P_RETRY_WRITE]     = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
 };
 
 int drbd_asender(struct drbd_thread *thi)
@@ -4842,10 +4848,20 @@ int drbd_asender(struct drbd_thread *thi)
                        }
                }
                if (received == expect) {
-                       tconn->last_received = jiffies;
-                       if (!cmd->process(vnr_to_mdev(tconn, pi.vnr), pi.cmd))
+                       bool rv;
+
+                       if (cmd->fa_type == CONN) {
+                               rv = cmd->conn_fn(tconn, pi.cmd);
+                       } else {
+                               struct drbd_conf *mdev = vnr_to_mdev(tconn, pi.vnr);
+                               rv = cmd->mdev_fn(mdev, pi.cmd);
+                       }
+
+                       if (!rv)
                                goto reconnect;
 
+                       tconn->last_received = jiffies;
+
                        /* the idle_timeout (ping-int)
                         * has been restored in got_PingAck() */
                        if (cmd == &asender_tbl[P_PING_ACK])