redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

printk: split message size computation 

We will want to recompute the message size when shrinking too long
messages.  Let's put the code into separate function.

The side effect of setting "pad_len" is not nice but it is worth removing
the code duplication.  Note that I will probably have one more usage for
this function when handling messages safe way in NMI context.

This patch does not change the existing behavior.

Signed-off-by: Petr Mladek <pmladek@suse.cz>
Cc: Jan Kara <jack@suse.cz>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Kay Sievers <kay@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
wifi-calibration
Petr Mladek 2014-06-04 16:11:31 -07:00 committed by Linus Torvalds
parent f40e4b9f70
commit 85c8704302
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/printk/printk.c
View File

@ -339,6 +339,18 @@ static int log_make_free_space(u32 msg_size)
return -ENOMEM;
}
/* compute the message size including the padding bytes */
static u32 msg_used_size(u16 text_len, u16 dict_len, u32 *pad_len)
{
u32 size;
size = sizeof(struct printk_log) + text_len + dict_len;
*pad_len = (-size) & (LOG_ALIGN - 1);
size += *pad_len;
return size;
}
/* insert record into the buffer, discard old ones, update heads */
static void log_store(int facility, int level,
enum log_flags flags, u64 ts_nsec,
@ -349,9 +361,7 @@ static void log_store(int facility, int level,
u32 size, pad_len;
/* number of '\0' padding bytes to next message */
size = sizeof(struct printk_log) + text_len + dict_len;
pad_len = (-size) & (LOG_ALIGN - 1);
size += pad_len;
size = msg_used_size(text_len, dict_len, &pad_len);
/* if message does not fit empty log buffer, ignore it */
if (log_make_free_space(size))