net: netconsole: track explicitly if msgbody was written to buffer

The current check to determine if the message body was fully sent is
difficult to follow. To improve clarity, introduce a variable that
explicitly tracks whether the message body (msgbody) has been completely
sent, indicating when it's time to begin sending userdata.

Additionally, add comments to make the code more understandable for
others who may work with it.

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 6a6806eeb0c6518125ff9a3bac561bebe1875fcc..9a5cca4ee8b8bbe4bbecf47a7617036a73a8ca99 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -1130,6 +1130,7 @@ static void send_msg_fragmented(struct netconsole_target *nt,
         */
        while (offset < body_len) {
                int this_header = header_len;
+               bool msgbody_written = false;
                int this_offset = 0;
                int this_chunk = 0;
 
@@ -1148,12 +1149,21 @@ static void send_msg_fragmented(struct netconsole_target *nt,
                        this_offset += this_chunk;
                }
 
+               /* msgbody was finally written, either in the previous
+                * messages and/or in the current buf. Time to write
+                * the userdata.
+                */
+               msgbody_written |= offset + this_offset >= msgbody_len;
+
                /* Msg body is fully written and there is pending userdata to
                 * write, append userdata in this chunk
                 */
-               if (offset + this_offset >= msgbody_len &&
-                   offset + this_offset < body_len) {
+               if (msgbody_written && offset + this_offset < body_len) {
+                       /* Track how much user data was already sent. First
+                        * time here, sent_userdata is zero
+                        */
                        int sent_userdata = (offset + this_offset) - msgbody_len;
+                       /* offset of bytes used in current buf */
                        int preceding_bytes = this_chunk + this_header;
 
                        if (WARN_ON_ONCE(sent_userdata < 0))