]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: netconsole: extract release appending into separate function
authorBreno Leitao <leitao@debian.org>
Thu, 17 Oct 2024 09:50:22 +0000 (02:50 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 22 Oct 2024 13:44:25 +0000 (15:44 +0200)
Refactor the code by extracting the logic for appending the
release into the buffer into a separate function.

The goal is to reduce the size of send_msg_fragmented() and improve
code readability.

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

index 9a5cca4ee8b8bbe4bbecf47a7617036a73a8ca99..e86a857bc166a30a271568853ad464dcc97f499e 100644 (file)
@@ -1084,6 +1084,14 @@ static void send_msg_no_fragmentation(struct netconsole_target *nt,
        netpoll_send_udp(&nt->np, buf, msg_len);
 }
 
+static void append_release(char *buf)
+{
+       const char *release;
+
+       release = init_utsname()->release;
+       scnprintf(buf, MAX_PRINT_CHUNK, "%s,", release);
+}
+
 static void send_msg_fragmented(struct netconsole_target *nt,
                                const char *msg,
                                const char *userdata,
@@ -1094,7 +1102,6 @@ static void send_msg_fragmented(struct netconsole_target *nt,
        static char buf[MAX_PRINT_CHUNK]; /* protected by target_list_lock */
        int offset = 0, userdata_len = 0;
        const char *header, *msgbody;
-       const char *release;
 
 #ifdef CONFIG_NETCONSOLE_DYNAMIC
        if (userdata)
@@ -1115,10 +1122,8 @@ static void send_msg_fragmented(struct netconsole_target *nt,
         * Transfer multiple chunks with the following extra header.
         * "ncfrag=<byte-offset>/<total-bytes>"
         */
-       if (release_len) {
-               release = init_utsname()->release;
-               scnprintf(buf, MAX_PRINT_CHUNK, "%s,", release);
-       }
+       if (release_len)
+               append_release(buf);
 
        /* Copy the header into the buffer */
        memcpy(buf + release_len, header, header_len);