2014-04-29 17:29:44

by Fabian Frédérick

Subject: [PATCH 2/2] mm/slub.c: convert vnsprintf-static to va_format

Inspired by Joe Perches suggestion in ntfs logging clean-up.

Cc: Christoph Lameter <[email protected]>
Cc: Joe Perches <[email protected]>
Cc: Andrew Morton <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
mm/slub.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mm/slub.c b/mm/slub.c
index 66ee34f..4991c44 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -581,28 +581,30 @@ static void print_page_info(struct page *page)

static void slab_bug(struct kmem_cache *s, char *fmt, ...)
{
+ struct va_format vaf;
va_list args;
- char buf[100];

va_start(args, fmt);
- vsnprintf(buf, sizeof(buf), fmt, args);
- va_end(args);
+ vaf.fmt = fmt;
+ vaf.va = &args;
pr_err("=============================================================================\n");
- pr_err("BUG %s (%s): %s\n", s->name, print_tainted(), buf);
+ pr_err("BUG %s (%s): %pV\n", s->name, print_tainted(), &vaf);
pr_err("-----------------------------------------------------------------------------\n\n");

add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
+ va_end(args);
}

static void slab_fix(struct kmem_cache *s, char *fmt, ...)
{
+ struct va_format vaf;
va_list args;
- char buf[100];

va_start(args, fmt);
- vsnprintf(buf, sizeof(buf), fmt, args);
+ vaf.fmt = fmt;
+ vaf.va = &args;
+ pr_err("FIX %s: %pV\n", s->name, &vaf);
va_end(args);
- pr_err("FIX %s: %s\n", s->name, buf);
}

static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
--
1.8.4.5

2014-04-29 18:51:49

by Christoph Lameter (Ampere)

Subject: Re: [PATCH 2/2] mm/slub.c: convert vnsprintf-static to va_format

On Tue, 29 Apr 2014, Fabian Frederick wrote:

> Inspired by Joe Perches suggestion in ntfs logging clean-up.

Looks interesting. Hope it works.

Acked-by: Christoph Lameter <[email protected]>