The patch titled
Subject: printk: tweak do_syslog() to match comments
has been added to the -mm tree. Its filename is
printk-tweak-do_syslog-to-match-comments.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/printk-tweak-do_syslog-to-match-comments.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/printk-tweak-do_syslog-to-match-comments.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Alex Elder <elder@xxxxxxxxxx>
Subject: printk: tweak do_syslog() to match comments
In do_syslog() there's a path used by kmsg_poll() and kmsg_read() that
only needs to know whether there's any data available to read (and not its
size). These callers only check for non-zero return. As a shortcut,
do_syslog() returns the difference between what has been logged and what
has been "seen."
The comments say that the "count of records" should be returned but it's
not. Instead it returns (log_next_idx - syslog_idx), which is a
difference between buffer offsets--and the result could be negative.
The behavior is the same (it'll be zero or not in the same cases), but the
count of records is more meaningful and it matches what the comments say.
So change the code to return that.
Signed-off-by: Alex Elder <elder@xxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Cc: John Stultz <john.stultz@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/printk/printk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/printk/printk.c~printk-tweak-do_syslog-to-match-comments kernel/printk/printk.c
--- a/kernel/printk/printk.c~printk-tweak-do_syslog-to-match-comments
+++ a/kernel/printk/printk.c
@@ -1351,7 +1351,7 @@ int do_syslog(int type, char __user *buf
* for pending data, not the size; return the count of
* records, not the length.
*/
- error = log_next_idx - syslog_idx;
+ error = log_next_seq - syslog_seq;
} else {
u64 seq = syslog_seq;
u32 idx = syslog_idx;
_
Patches currently in -mm which might be from elder@xxxxxxxxxx are
printk-tweak-do_syslog-to-match-comments.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
