Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: netconsole: introduce variable to track body length

Browse Source 
This new variable tracks the total length of the data to be sent,
encompassing both the message body (msgbody) and userdata, which is
collectively called body.

By explicitly defining body_len, the code becomes clearer and easier to
reason about, simplifying offset calculations and improving overall
readability of the function.

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Breno Leitao 2024-10-17 02:50:20 -07:00 committed by Paolo Abeni
parent e1fa5d23b2
commit 606994ad26
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/netconsole.c
View File

@ -1090,10 +1090,10 @@ static void send_msg_fragmented(struct netconsole_target *nt,
int msg_len,
int release_len)
{
int header_len, msgbody_len, body_len;
static char buf[MAX_PRINT_CHUNK]; /* protected by target_list_lock */
int offset = 0, userdata_len = 0;
const char *header, *msgbody;
int header_len, msgbody_len;
const char *release;
#ifdef CONFIG_NETCONSOLE_DYNAMIC
@ -1124,10 +1124,11 @@ static void send_msg_fragmented(struct netconsole_target *nt,
memcpy(buf + release_len, header, header_len);
header_len += release_len;
body_len = msgbody_len + userdata_len;
/* for now on, the header will be persisted, and the msgbody
* will be replaced
*/
while (offset < msgbody_len + userdata_len) {
while (offset < body_len) {
int this_header = header_len;
int this_offset = 0;
int this_chunk = 0;
@ -1135,7 +1136,7 @@ static void send_msg_fragmented(struct netconsole_target *nt,
this_header += scnprintf(buf + this_header,
sizeof(buf) - this_header,
",ncfrag=%d/%d;", offset,
msgbody_len + userdata_len);
body_len);
/* Not all msgbody data has been written yet */
if (offset < msgbody_len) {
@ -1151,7 +1152,7 @@ static void send_msg_fragmented(struct netconsole_target *nt,
* write, append userdata in this chunk
*/
if (offset + this_offset >= msgbody_len &&
offset + this_offset < userdata_len + msgbody_len) {
offset + this_offset < body_len) {
int sent_userdata = (offset + this_offset) - msgbody_len;
int preceding_bytes = this_chunk + this_header;