Commit 8172f3e9 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner

drbd: decode_header(): Return 0 upon success and an error code otherwise

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent e2b3032b
...@@ -948,7 +948,7 @@ static int drbd_connect(struct drbd_tconn *tconn) ...@@ -948,7 +948,7 @@ static int drbd_connect(struct drbd_tconn *tconn)
return -1; return -1;
} }
static bool decode_header(struct drbd_tconn *tconn, struct p_header *h, struct packet_info *pi) static int decode_header(struct drbd_tconn *tconn, struct p_header *h, struct packet_info *pi)
{ {
if (h->h80.magic == cpu_to_be32(DRBD_MAGIC)) { if (h->h80.magic == cpu_to_be32(DRBD_MAGIC)) {
pi->cmd = be16_to_cpu(h->h80.command); pi->cmd = be16_to_cpu(h->h80.command);
...@@ -963,9 +963,9 @@ static bool decode_header(struct drbd_tconn *tconn, struct p_header *h, struct p ...@@ -963,9 +963,9 @@ static bool decode_header(struct drbd_tconn *tconn, struct p_header *h, struct p
be32_to_cpu(h->h80.magic), be32_to_cpu(h->h80.magic),
be16_to_cpu(h->h80.command), be16_to_cpu(h->h80.command),
be16_to_cpu(h->h80.length)); be16_to_cpu(h->h80.length));
return false; return -EINVAL;
} }
return true; return 0;
} }
static int drbd_recv_header(struct drbd_tconn *tconn, struct packet_info *pi) static int drbd_recv_header(struct drbd_tconn *tconn, struct packet_info *pi)
...@@ -980,7 +980,7 @@ static int drbd_recv_header(struct drbd_tconn *tconn, struct packet_info *pi) ...@@ -980,7 +980,7 @@ static int drbd_recv_header(struct drbd_tconn *tconn, struct packet_info *pi)
return false; return false;
} }
r = decode_header(tconn, h, pi); r = !decode_header(tconn, h, pi);
tconn->last_received = jiffies; tconn->last_received = jiffies;
return r; return r;
...@@ -4845,7 +4845,7 @@ int drbd_asender(struct drbd_thread *thi) ...@@ -4845,7 +4845,7 @@ int drbd_asender(struct drbd_thread *thi)
} }
if (received == expect && cmd == NULL) { if (received == expect && cmd == NULL) {
if (!decode_header(tconn, h, &pi)) if (decode_header(tconn, h, &pi))
goto reconnect; goto reconnect;
cmd = &asender_tbl[pi.cmd]; cmd = &asender_tbl[pi.cmd];
if (pi.cmd >= ARRAY_SIZE(asender_tbl) || !cmd) { if (pi.cmd >= ARRAY_SIZE(asender_tbl) || !cmd) {
......
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