Commit 267e2a9c authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds

Use WARN() in fs/proc/

Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.
This way, the entire if() {} section can collapse into the WARN() as well.
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 99fcd77d
...@@ -806,12 +806,9 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent) ...@@ -806,12 +806,9 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent)
if (S_ISDIR(de->mode)) if (S_ISDIR(de->mode))
parent->nlink--; parent->nlink--;
de->nlink = 0; de->nlink = 0;
if (de->subdir) { WARN(de->subdir, KERN_WARNING "%s: removing non-empty directory "
printk(KERN_WARNING "%s: removing non-empty directory "
"'%s/%s', leaking at least '%s'\n", __func__, "'%s/%s', leaking at least '%s'\n", __func__,
de->parent->name, de->name, de->subdir->name); de->parent->name, de->name, de->subdir->name);
WARN_ON(1);
}
if (atomic_dec_and_test(&de->count)) if (atomic_dec_and_test(&de->count))
free_proc_entry(de); free_proc_entry(de);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment