Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fcb8f30 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Improve the "unexpected packet" error messages 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 9510b241

drivers/block/drbd/drbd_receiver.c

+11 −9
Original line number Diff line number Diff line
@@ -3200,8 +3200,8 @@ static int ignore_remaining_packet(struct drbd_tconn *tconn, struct packet_info 
 */

static int config_unknown_volume(struct drbd_tconn *tconn, struct packet_info *pi)

{

	conn_warn(tconn, "Volume %u unknown; ignoring %s packet\n",

		  pi->vnr, cmdname(pi->cmd));

	conn_warn(tconn, "%s packet received for volume %u, which is not configured locally\n",

		  cmdname(pi->cmd), pi->vnr);

	return ignore_remaining_packet(tconn, pi);

}
@@ -4256,13 +4256,15 @@ static void drbdd(struct drbd_tconn *tconn) 


		cmd = &drbd_cmd_handler[pi.cmd];

		if (unlikely(pi.cmd >= ARRAY_SIZE(drbd_cmd_handler) || !cmd->fn)) {

			conn_err(tconn, "unknown packet type %d, l: %d!\n", pi.cmd, pi.size);

			conn_err(tconn, "Unexpected data packet %s (0x%04x)",

				 cmdname(pi.cmd), pi.cmd);

			goto err_out;

		}



		shs = cmd->pkt_size;

		if (pi.size > shs && !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;

		}
@@ -5192,8 +5194,8 @@ int drbd_asender(struct drbd_thread *thi) 
				goto reconnect;

			cmd = &asender_tbl[pi.cmd];

			if (pi.cmd >= ARRAY_SIZE(asender_tbl) || !cmd->fn) {

				conn_err(tconn, "unknown command %d on meta (l: %d)\n",

					pi.cmd, pi.size);

				conn_err(tconn, "Unexpected meta packet %s (0x%04x)\n",

					 cmdname(pi.cmd), pi.cmd);

				goto disconnect;

			}

			expect = header_size + cmd->pkt_size;