Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87ebdc00 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e579d2c2

fs/proc/base.c

+2 −1
Original line number Diff line number Diff line
@@ -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));

fs/proc/generic.c

+9 −18
Original line number Diff line number Diff line
@@ -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,7 +821,7 @@ 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 "

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

fs/proc/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

	}

fs/proc/kcore.c

+2 −1
Original line number Diff line number Diff line
@@ -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 */

fs/proc/proc_devtree.c

+7 −6
Original line number Diff line number Diff line
@@ -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,7 +154,7 @@ 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 "

		pr_err("device-tree: Out of memory trying to fixup "

		       "name \"%s\"\n", name);

		return name;

	}
@@ -175,8 +176,8 @@ static const char *fixup_name(struct device_node *np, struct proc_dir_entry *de, 
		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;

}