fs/proc: clean up printks

- use pr_foo() throughout

- remove a couple of duplicated KERN_WARNINGs, via WARN(KERN_WARNING "...")

- nuke a few warnings which I've never seen happen, ever.

Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/proc/base.c b/fs/proc/base.c
index f3b133d799145de9de20cbaa3bb67af4a47cccb2..69078c7cef1fa1443472f21bf4c98bb435fb7824 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -73,6 +73,7 @@
 #include <linux/security.h>
 #include <linux/ptrace.h>
 #include <linux/tracehook.h>
+#include <linux/printk.h>
 #include <linux/cgroup.h>
 #include <linux/cpuset.h>
 #include <linux/audit.h>
@@ -952,7 +953,7 @@ static ssize_t oom_adj_write(struct file *file, const char __user *buf,
         * /proc/pid/oom_adj is provided for legacy purposes, ask users to use
         * /proc/pid/oom_score_adj instead.
         */
-       printk_once(KERN_WARNING "%s (%d): /proc/%d/oom_adj is deprecated, please use /proc/%d/oom_score_adj instead.\n",
+       pr_warn_once("%s (%d): /proc/%d/oom_adj is deprecated, please use /proc/%d/oom_score_adj instead.\n",
                  current->comm, task_pid_nr(current), task_pid_nr(task),
                  task_pid_nr(task));
 

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 2983dc52ca2524c7a1b0e8f168ae5f40e488f609..4b3b3ffb52f14e234aa3ec99abde281ca41e1817 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -15,6 +15,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/printk.h>
 #include <linux/mount.h>
 #include <linux/init.h>
 #include <linux/idr.h>
@@ -132,11 +133,8 @@ __proc_file_read(struct file *file, char __user *buf, size_t nbytes,
                }
 
                if (start == NULL) {
-                       if (n > PAGE_SIZE) {
-                               printk(KERN_ERR
-                                      "proc_file_read: Apparent buffer overflow!\n");
+                       if (n > PAGE_SIZE)      /* Apparent buffer overflow */
                                n = PAGE_SIZE;
-                       }
                        n -= *ppos;
                        if (n <= 0)
                                break;
@@ -144,26 +142,19 @@ __proc_file_read(struct file *file, char __user *buf, size_t nbytes,
                                n = count;
                        start = page + *ppos;
                } else if (start < page) {
-                       if (n > PAGE_SIZE) {
-                               printk(KERN_ERR
-                                      "proc_file_read: Apparent buffer overflow!\n");
+                       if (n > PAGE_SIZE)      /* Apparent buffer overflow */
                                n = PAGE_SIZE;
-                       }
                        if (n > count) {
                                /*
                                 * Don't reduce n because doing so might
                                 * cut off part of a data block.
                                 */
-                               printk(KERN_WARNING
-                                      "proc_file_read: Read count exceeded\n");
+                               pr_warn("proc_file_read: count exceeded\n");
                        }
                } else /* start >= page */ {
                        unsigned long startoff = (unsigned long)(start - page);
-                       if (n > (PAGE_SIZE - startoff)) {
-                               printk(KERN_ERR
-                                      "proc_file_read: Apparent buffer overflow!\n");
+                       if (n > (PAGE_SIZE - startoff)) /* buffer overflow? */
                                n = PAGE_SIZE - startoff;
-                       }
                        if (n > count)
                                n = count;
                }
@@ -569,7 +560,7 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
 
        for (tmp = dir->subdir; tmp; tmp = tmp->next)
                if (strcmp(tmp->name, dp->name) == 0) {
-                       WARN(1, KERN_WARNING "proc_dir_entry '%s/%s' already registered\n",
+                       WARN(1, "proc_dir_entry '%s/%s' already registered\n",
                                dir->name, dp->name);
                        break;
                }
@@ -830,9 +821,9 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)
        if (S_ISDIR(de->mode))
                parent->nlink--;
        de->nlink = 0;
-       WARN(de->subdir, KERN_WARNING "%s: removing non-empty directory "
-                       "'%s/%s', leaking at least '%s'\n", __func__,
-                       de->parent->name, de->name, de->subdir->name);
+       WARN(de->subdir, "%s: removing non-empty directory "
+                        "'%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/inode.c b/fs/proc/inode.c
index 70322e1a4f0f58dbc4f0831b9ef95af7d9d49d75..a86aebc9ba7c252bbfa73907612b59c177fca202 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -13,6 +13,7 @@
 #include <linux/stat.h>
 #include <linux/completion.h>
 #include <linux/poll.h>
+#include <linux/printk.h>
 #include <linux/file.h>
 #include <linux/limits.h>
 #include <linux/init.h>
@@ -495,13 +496,13 @@ int proc_fill_super(struct super_block *s)
        pde_get(&proc_root);
        root_inode = proc_get_inode(s, &proc_root);
        if (!root_inode) {
-               printk(KERN_ERR "proc_fill_super: get root inode failed\n");
+               pr_err("proc_fill_super: get root inode failed\n");
                return -ENOMEM;
        }
 
        s->s_root = d_make_root(root_inode);
        if (!s->s_root) {
-               printk(KERN_ERR "proc_fill_super: allocate dentry failed\n");
+               pr_err("proc_fill_super: allocate dentry failed\n");
                return -ENOMEM;
        }
 

diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index e96d4f18ca3a93e5dd62e1be430028bc3413d250..eda6f017f272755e2a5bfdbe73fae33c231394a2 100644 (file)
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -17,6 +17,7 @@
 #include <linux/elfcore.h>
 #include <linux/vmalloc.h>
 #include <linux/highmem.h>
+#include <linux/printk.h>
 #include <linux/bootmem.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -619,7 +620,7 @@ static int __init proc_kcore_init(void)
        proc_root_kcore = proc_create("kcore", S_IRUSR, NULL,
                                      &proc_kcore_operations);
        if (!proc_root_kcore) {
-               printk(KERN_ERR "couldn't create /proc/kcore\n");
+               pr_err("couldn't create /proc/kcore\n");
                return 0; /* Always returns 0. */
        }
        /* Store text area if it's special */

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index de20ec480fa082402f557014b285f685be4974d2..30b590f5bd356f088e0df909c0adcf44aae3f801 100644 (file)
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -8,6 +8,7 @@
 #include <linux/time.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/printk.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/of.h>
@@ -110,8 +111,8 @@ void proc_device_tree_update_prop(struct proc_dir_entry *pde,
                if (ent->data == oldprop)
                        break;
        if (ent == NULL) {
-               printk(KERN_WARNING "device-tree: property \"%s\" "
-                      " does not exist\n", oldprop->name);
+               pr_warn("device-tree: property \"%s\" does not exist\n",
+                       oldprop->name);
        } else {
                ent->data = newprop;
                ent->size = newprop->length;
@@ -153,8 +154,8 @@ static const char *fixup_name(struct device_node *np, struct proc_dir_entry *de,
 realloc:
        fixed_name = kmalloc(fixup_len, GFP_KERNEL);
        if (fixed_name == NULL) {
-               printk(KERN_ERR "device-tree: Out of memory trying to fixup "
-                               "name \"%s\"\n", name);
+               pr_err("device-tree: Out of memory trying to fixup "
+                      "name \"%s\"\n", name);
                return name;
        }
 
@@ -175,8 +176,8 @@ retry:
                goto retry;
        }
 
-       printk(KERN_WARNING "device-tree: Duplicate name in %s, "
-                       "renamed to \"%s\"\n", np->full_name, fixed_name);
+       pr_warn("device-tree: Duplicate name in %s, renamed to \"%s\"\n",
+               np->full_name, fixed_name);
 
        return fixed_name;
 }

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 612df79cc6a11db724bf93d8941311fb780fdd08..ac05f33a0dde360aebbcacd9d02df8a8b927797a 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -5,6 +5,7 @@
 #include <linux/sysctl.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
+#include <linux/printk.h>
 #include <linux/security.h>
 #include <linux/sched.h>
 #include <linux/namei.h>
@@ -57,7 +58,7 @@ static void sysctl_print_dir(struct ctl_dir *dir)
 {
        if (dir->header.parent)
                sysctl_print_dir(dir->header.parent);
-       printk(KERN_CONT "%s/", dir->header.ctl_table[0].procname);
+       pr_cont("%s/", dir->header.ctl_table[0].procname);
 }
 
 static int namecmp(const char *name1, int len1, const char *name2, int len2)
@@ -134,9 +135,9 @@ static int insert_entry(struct ctl_table_header *head, struct ctl_table *entry)
                else if (cmp > 0)
                        p = &(*p)->rb_right;
                else {
-                       printk(KERN_ERR "sysctl duplicate entry: ");
+                       pr_err("sysctl duplicate entry: ");
                        sysctl_print_dir(head->parent);
-                       printk(KERN_CONT "/%s\n", entry->procname);
+                       pr_cont("/%s\n", entry->procname);
                        return -EEXIST;
                }
        }
@@ -927,9 +928,9 @@ found:
        subdir->header.nreg++;
 failed:
        if (unlikely(IS_ERR(subdir))) {
-               printk(KERN_ERR "sysctl could not get directory: ");
+               pr_err("sysctl could not get directory: ");
                sysctl_print_dir(dir);
-               printk(KERN_CONT "/%*.*s %ld\n",
+               pr_cont("/%*.*s %ld\n",
                        namelen, namelen, name, PTR_ERR(subdir));
        }
        drop_sysctl_table(&dir->header);
@@ -995,8 +996,8 @@ static int sysctl_err(const char *path, struct ctl_table *table, char *fmt, ...)
        vaf.fmt = fmt;
        vaf.va = &args;
 
-       printk(KERN_ERR "sysctl table check failed: %s/%s %pV\n",
-               path, table->procname, &vaf);
+       pr_err("sysctl table check failed: %s/%s %pV\n",
+              path, table->procname, &vaf);
 
        va_end(args);
        return -EINVAL;
@@ -1510,9 +1511,9 @@ static void put_links(struct ctl_table_header *header)
                        drop_sysctl_table(link_head);
                }
                else {
-                       printk(KERN_ERR "sysctl link missing during unregister: ");
+                       pr_err("sysctl link missing during unregister: ");
                        sysctl_print_dir(parent);
-                       printk(KERN_CONT "/%s\n", name);
+                       pr_cont("/%s\n", name);
                }
        }
 }

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 0d5071d29985b527eb4d2f6819b08646c82a2a30..41dd018f72dd00ca1885a34fec2bfc21c94f9a44 100644 (file)
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -15,6 +15,7 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
+#include <linux/printk.h>
 #include <linux/bootmem.h>
 #include <linux/init.h>
 #include <linux/crash_dump.h>
@@ -553,8 +554,7 @@ static int __init parse_crash_elf64_headers(void)
                ehdr.e_ehsize != sizeof(Elf64_Ehdr) ||
                ehdr.e_phentsize != sizeof(Elf64_Phdr) ||
                ehdr.e_phnum == 0) {
-               printk(KERN_WARNING "Warning: Core image elf header is not"
-                                       "sane\n");
+               pr_warn("Warning: Core image elf header is not sane\n");
                return -EINVAL;
        }
 
@@ -609,8 +609,7 @@ static int __init parse_crash_elf32_headers(void)
                ehdr.e_ehsize != sizeof(Elf32_Ehdr) ||
                ehdr.e_phentsize != sizeof(Elf32_Phdr) ||
                ehdr.e_phnum == 0) {
-               printk(KERN_WARNING "Warning: Core image elf header is not"
-                                       "sane\n");
+               pr_warn("Warning: Core image elf header is not sane\n");
                return -EINVAL;
        }
 
@@ -653,8 +652,7 @@ static int __init parse_crash_elf_headers(void)
        if (rc < 0)
                return rc;
        if (memcmp(e_ident, ELFMAG, SELFMAG) != 0) {
-               printk(KERN_WARNING "Warning: Core image elf header"
-                                       " not found\n");
+               pr_warn("Warning: Core image elf header not found\n");
                return -EINVAL;
        }
 
@@ -673,8 +671,7 @@ static int __init parse_crash_elf_headers(void)
                /* Determine vmcore size. */
                vmcore_size = get_vmcore_size_elf32(elfcorebuf);
        } else {
-               printk(KERN_WARNING "Warning: Core image elf header is not"
-                                       " sane\n");
+               pr_warn("Warning: Core image elf header is not sane\n");
                return -EINVAL;
        }
        return 0;
@@ -690,7 +687,7 @@ static int __init vmcore_init(void)
                return rc;
        rc = parse_crash_elf_headers();
        if (rc) {
-               printk(KERN_WARNING "Kdump: vmcore not initialized\n");
+               pr_warn("Kdump: vmcore not initialized\n");
                return rc;
        }