diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-04 19:05:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:53:53 -0400 |
commit | c6686931335757c2b348fc9a74ff564d8bd10f0a (patch) | |
tree | ac2ebc605cd540831edfcc9284b757848c91ed26 /fs/configfs | |
parent | f6b1fe7c27800adba0ccf6063ee97478046eeafe (diff) |
fs/configfs: convert printk to pr_foo()
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>
Diffstat (limited to 'fs/configfs')
-rw-r--r-- | fs/configfs/dir.c | 8 | ||||
-rw-r--r-- | fs/configfs/inode.c | 5 | ||||
-rw-r--r-- | fs/configfs/mount.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index e081acbac2e7..727d06ef348c 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c | |||
@@ -940,9 +940,9 @@ static void client_drop_item(struct config_item *parent_item, | |||
940 | #ifdef DEBUG | 940 | #ifdef DEBUG |
941 | static void configfs_dump_one(struct configfs_dirent *sd, int level) | 941 | static void configfs_dump_one(struct configfs_dirent *sd, int level) |
942 | { | 942 | { |
943 | printk(KERN_INFO "%*s\"%s\":\n", level, " ", configfs_get_name(sd)); | 943 | pr_info("%*s\"%s\":\n", level, " ", configfs_get_name(sd)); |
944 | 944 | ||
945 | #define type_print(_type) if (sd->s_type & _type) printk(KERN_INFO "%*s %s\n", level, " ", #_type); | 945 | #define type_print(_type) if (sd->s_type & _type) pr_info("%*s %s\n", level, " ", #_type); |
946 | type_print(CONFIGFS_ROOT); | 946 | type_print(CONFIGFS_ROOT); |
947 | type_print(CONFIGFS_DIR); | 947 | type_print(CONFIGFS_DIR); |
948 | type_print(CONFIGFS_ITEM_ATTR); | 948 | type_print(CONFIGFS_ITEM_ATTR); |
@@ -1699,7 +1699,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys) | |||
1699 | struct dentry *root = dentry->d_sb->s_root; | 1699 | struct dentry *root = dentry->d_sb->s_root; |
1700 | 1700 | ||
1701 | if (dentry->d_parent != root) { | 1701 | if (dentry->d_parent != root) { |
1702 | printk(KERN_ERR "configfs: Tried to unregister non-subsystem!\n"); | 1702 | pr_err("configfs: Tried to unregister non-subsystem!\n"); |
1703 | return; | 1703 | return; |
1704 | } | 1704 | } |
1705 | 1705 | ||
@@ -1709,7 +1709,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys) | |||
1709 | mutex_lock(&configfs_symlink_mutex); | 1709 | mutex_lock(&configfs_symlink_mutex); |
1710 | spin_lock(&configfs_dirent_lock); | 1710 | spin_lock(&configfs_dirent_lock); |
1711 | if (configfs_detach_prep(dentry, NULL)) { | 1711 | if (configfs_detach_prep(dentry, NULL)) { |
1712 | printk(KERN_ERR "configfs: Tried to unregister non-empty subsystem!\n"); | 1712 | pr_err("configfs: Tried to unregister non-empty subsystem!\n"); |
1713 | } | 1713 | } |
1714 | spin_unlock(&configfs_dirent_lock); | 1714 | spin_unlock(&configfs_dirent_lock); |
1715 | mutex_unlock(&configfs_symlink_mutex); | 1715 | mutex_unlock(&configfs_symlink_mutex); |
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c index a9d35b0e06cf..fbb30db0fce7 100644 --- a/fs/configfs/inode.c +++ b/fs/configfs/inode.c | |||
@@ -168,9 +168,8 @@ static void configfs_set_inode_lock_class(struct configfs_dirent *sd, | |||
168 | * In practice the maximum level of locking depth is | 168 | * In practice the maximum level of locking depth is |
169 | * already reached. Just inform about possible reasons. | 169 | * already reached. Just inform about possible reasons. |
170 | */ | 170 | */ |
171 | printk(KERN_INFO "configfs: Too many levels of inodes" | 171 | pr_info("configfs: Too many levels of inodes for the locking correctness validator.\n"); |
172 | " for the locking correctness validator.\n"); | 172 | pr_info("Spurious warnings may appear.\n"); |
173 | printk(KERN_INFO "Spurious warnings may appear.\n"); | ||
174 | } | 173 | } |
175 | } | 174 | } |
176 | } | 175 | } |
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c index 7f26c3cf75ae..af08de0271fe 100644 --- a/fs/configfs/mount.c +++ b/fs/configfs/mount.c | |||
@@ -155,7 +155,7 @@ static int __init configfs_init(void) | |||
155 | 155 | ||
156 | return 0; | 156 | return 0; |
157 | out4: | 157 | out4: |
158 | printk(KERN_ERR "configfs: Unable to register filesystem!\n"); | 158 | pr_err("configfs: Unable to register filesystem!\n"); |
159 | configfs_inode_exit(); | 159 | configfs_inode_exit(); |
160 | out3: | 160 | out3: |
161 | kobject_put(config_kobj); | 161 | kobject_put(config_kobj); |