From 250acb2db22a322e62f2da2841cdb8e12cb52f32 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 20 Feb 2013 13:15:57 +1100 Subject: [PATCH] fs-proc-clean-up-printks-fix-fix Cc: Joe Perches Signed-off-by: Andrew Morton --- fs/proc/generic.c | 4 ++-- fs/proc/proc_sysctl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/proc/generic.c b/fs/proc/generic.c index d00072351cd5..91a397d8ce38 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -829,8 +829,8 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent) parent->nlink--; de->nlink = 0; WARN(de->subdir, "%s: removing non-empty directory " - "'%s/%s', leaking at least '%s'\n", __func__, - de->parent->name, de->name, de->subdir->name); + "'%s/%s', leaking at least '%s'\n", __func__, + de->parent->name, de->name, de->subdir->name); pde_put(de); } EXPORT_SYMBOL(remove_proc_entry); diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 6384b04175af..e7853a5c6c63 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -997,7 +997,7 @@ static int sysctl_err(const char *path, struct ctl_table *table, char *fmt, ...) vaf.va = &args; pr_err("sysctl table check failed: %s/%s %pV\n", - path, table->procname, &vaf); + path, table->procname, &vaf); va_end(args); return -EINVAL; -- 2.39.5