Merge remote-tracking branch 'dwmw2/master'

[karo-tx-linux.git] / fs / proc / generic.c

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);