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

Commit c6686931 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/configfs: convert printk to pr_foo() 



Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6b1fe7c

fs/configfs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -940,9 +940,9 @@ static void client_drop_item(struct config_item *parent_item, 
#ifdef DEBUG

static void configfs_dump_one(struct configfs_dirent *sd, int level)

{

	printk(KERN_INFO "%*s\"%s\":\n", level, " ", configfs_get_name(sd));

	pr_info("%*s\"%s\":\n", level, " ", configfs_get_name(sd));



#define type_print(_type) if (sd->s_type & _type) printk(KERN_INFO "%*s %s\n", level, " ", #_type);

#define type_print(_type) if (sd->s_type & _type) pr_info("%*s %s\n", level, " ", #_type);

	type_print(CONFIGFS_ROOT);

	type_print(CONFIGFS_DIR);

	type_print(CONFIGFS_ITEM_ATTR);
@@ -1699,7 +1699,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys) 
	struct dentry *root = dentry->d_sb->s_root;



	if (dentry->d_parent != root) {

		printk(KERN_ERR "configfs: Tried to unregister non-subsystem!\n");

		pr_err("configfs: Tried to unregister non-subsystem!\n");

		return;

	}
@@ -1709,7 +1709,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys) 
	mutex_lock(&configfs_symlink_mutex);

	spin_lock(&configfs_dirent_lock);

	if (configfs_detach_prep(dentry, NULL)) {

		printk(KERN_ERR "configfs: Tried to unregister non-empty subsystem!\n");

		pr_err("configfs: Tried to unregister non-empty subsystem!\n");

	}

	spin_unlock(&configfs_dirent_lock);

	mutex_unlock(&configfs_symlink_mutex);

fs/configfs/inode.c

+2 −3
Original line number Diff line number Diff line
@@ -168,9 +168,8 @@ static void configfs_set_inode_lock_class(struct configfs_dirent *sd, 
			 * In practice the maximum level of locking depth is

			 * already reached. Just inform about possible reasons.

			 */

			printk(KERN_INFO "configfs: Too many levels of inodes"

			       " for the locking correctness validator.\n");

			printk(KERN_INFO "Spurious warnings may appear.\n");

			pr_info("configfs: Too many levels of inodes for the locking correctness validator.\n");

			pr_info("Spurious warnings may appear.\n");

		}

	}

}

fs/configfs/mount.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int __init configfs_init(void) 


	return 0;

out4:

	printk(KERN_ERR "configfs: Unable to register filesystem!\n");

	pr_err("configfs: Unable to register filesystem!\n");

	configfs_inode_exit();

out3:

	kobject_put(config_kobj);