fs/configfs: use pr_fmt
Add pr_fmt based on module name. Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c668693133
commit
1d88aa441f
|
@ -24,6 +24,12 @@
|
||||||
* configfs Copyright (C) 2005 Oracle. All rights reserved.
|
* configfs Copyright (C) 2005 Oracle. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef pr_fmt
|
||||||
|
#undef pr_fmt
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||||
|
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
|
|
|
@ -1699,7 +1699,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys)
|
||||||
struct dentry *root = dentry->d_sb->s_root;
|
struct dentry *root = dentry->d_sb->s_root;
|
||||||
|
|
||||||
if (dentry->d_parent != root) {
|
if (dentry->d_parent != root) {
|
||||||
pr_err("configfs: Tried to unregister non-subsystem!\n");
|
pr_err("Tried to unregister non-subsystem!\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1709,7 +1709,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys)
|
||||||
mutex_lock(&configfs_symlink_mutex);
|
mutex_lock(&configfs_symlink_mutex);
|
||||||
spin_lock(&configfs_dirent_lock);
|
spin_lock(&configfs_dirent_lock);
|
||||||
if (configfs_detach_prep(dentry, NULL)) {
|
if (configfs_detach_prep(dentry, NULL)) {
|
||||||
pr_err("configfs: Tried to unregister non-empty subsystem!\n");
|
pr_err("Tried to unregister non-empty subsystem!\n");
|
||||||
}
|
}
|
||||||
spin_unlock(&configfs_dirent_lock);
|
spin_unlock(&configfs_dirent_lock);
|
||||||
mutex_unlock(&configfs_symlink_mutex);
|
mutex_unlock(&configfs_symlink_mutex);
|
||||||
|
|
|
@ -168,7 +168,7 @@ static void configfs_set_inode_lock_class(struct configfs_dirent *sd,
|
||||||
* In practice the maximum level of locking depth is
|
* In practice the maximum level of locking depth is
|
||||||
* already reached. Just inform about possible reasons.
|
* already reached. Just inform about possible reasons.
|
||||||
*/
|
*/
|
||||||
pr_info("configfs: Too many levels of inodes for the locking correctness validator.\n");
|
pr_info("Too many levels of inodes for the locking correctness validator.\n");
|
||||||
pr_info("Spurious warnings may appear.\n");
|
pr_info("Spurious warnings may appear.\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
|
||||||
/* directory inodes start off with i_nlink == 2 (for "." entry) */
|
/* directory inodes start off with i_nlink == 2 (for "." entry) */
|
||||||
inc_nlink(inode);
|
inc_nlink(inode);
|
||||||
} else {
|
} else {
|
||||||
pr_debug("configfs: could not get root inode\n");
|
pr_debug("could not get root inode\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ static int __init configfs_init(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
out4:
|
out4:
|
||||||
pr_err("configfs: Unable to register filesystem!\n");
|
pr_err("Unable to register filesystem!\n");
|
||||||
configfs_inode_exit();
|
configfs_inode_exit();
|
||||||
out3:
|
out3:
|
||||||
kobject_put(config_kobj);
|
kobject_put(config_kobj);
|
||||||
|
|
Loading…
Reference in New Issue