Commit deebe195 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner

drbd: A small cleanup in drbdd()

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 79ed9bd0
...@@ -3945,18 +3945,20 @@ static void drbdd(struct drbd_tconn *tconn) ...@@ -3945,18 +3945,20 @@ static void drbdd(struct drbd_tconn *tconn)
int err; int err;
while (get_t_state(&tconn->receiver) == RUNNING) { while (get_t_state(&tconn->receiver) == RUNNING) {
struct data_cmd *cmd;
drbd_thread_current_set_cpu(&tconn->receiver); drbd_thread_current_set_cpu(&tconn->receiver);
if (drbd_recv_header(tconn, &pi)) if (drbd_recv_header(tconn, &pi))
goto err_out; goto err_out;
if (unlikely(pi.cmd >= ARRAY_SIZE(drbd_cmd_handler) || cmd = &drbd_cmd_handler[pi.cmd];
!drbd_cmd_handler[pi.cmd].mdev_fn)) { if (unlikely(pi.cmd >= ARRAY_SIZE(drbd_cmd_handler) || !cmd->mdev_fn)) {
conn_err(tconn, "unknown packet type %d, l: %d!\n", pi.cmd, pi.size); conn_err(tconn, "unknown packet type %d, l: %d!\n", pi.cmd, pi.size);
goto err_out; goto err_out;
} }
shs = drbd_cmd_handler[pi.cmd].pkt_size - sizeof(struct p_header); shs = cmd->pkt_size - sizeof(struct p_header);
if (pi.size - shs > 0 && !drbd_cmd_handler[pi.cmd].expect_payload) { if (pi.size - shs > 0 && !cmd->expect_payload) {
conn_err(tconn, "No payload expected %s l:%d\n", cmdname(pi.cmd), pi.size); conn_err(tconn, "No payload expected %s l:%d\n", cmdname(pi.cmd), pi.size);
goto err_out; goto err_out;
} }
...@@ -3967,12 +3969,12 @@ static void drbdd(struct drbd_tconn *tconn) ...@@ -3967,12 +3969,12 @@ static void drbdd(struct drbd_tconn *tconn)
goto err_out; goto err_out;
} }
if (drbd_cmd_handler[pi.cmd].fa_type == CONN) { if (cmd->fa_type == CONN) {
err = drbd_cmd_handler[pi.cmd].conn_fn(tconn, pi.cmd, pi.size - shs); err = cmd->conn_fn(tconn, pi.cmd, pi.size - shs);
} else { } else {
struct drbd_conf *mdev = vnr_to_mdev(tconn, pi.vnr); struct drbd_conf *mdev = vnr_to_mdev(tconn, pi.vnr);
err = mdev ? err = mdev ?
drbd_cmd_handler[pi.cmd].mdev_fn(mdev, pi.cmd, pi.size - shs) : cmd->mdev_fn(mdev, pi.cmd, pi.size - shs) :
tconn_receive_skip(tconn, pi.cmd, pi.size - shs); tconn_receive_skip(tconn, pi.cmd, pi.size - shs);
} }
......
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