From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Mon, 19 Nov 2007 02:59:09 +0000 (-0500)
Subject: Unionfs ODF: prefix all printk' strings with "unionfs: "
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=f4fdb32f016f5ff205aad0dc4ff13895536be205;p=unionfs-odf.git

Unionfs ODF: prefix all printk' strings with "unionfs: "

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---

diff --git a/fs/unionfs/config.c b/fs/unionfs/config.c
index a6f8dfa180..8d42fa78f7 100644
--- a/fs/unionfs/config.c
+++ b/fs/unionfs/config.c
@@ -288,7 +288,7 @@ int unionfs_config_init(void)
 	init_MUTEX(&unionfs_subsys.su_sem);
 	err = configfs_register_subsystem(&unionfs_subsys);
 	if (err)
-		printk(KERN_ERR "Error %d while registering subsystem %s\n",
+		printk(KERN_ERR "unionfs: error %d while registering subsystem %s\n",
 		       err,
 		       unionfs_subsys.su_group.cg_item.ci_namebuf);
 	return err;
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 0686c81b0f..66ddfc6945 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -137,7 +137,7 @@ struct dentry *unionfs_interpose(struct dentry *dentry, struct super_block *sb,
 			err = odf_lookup(dentry->d_parent, dentry, odf_flag);
 		if (err) {
 			printk(KERN_ERR
-			       "unionfs_interpose: odf failed to create "
+			       "unionfs: interpose: odf failed to create "
 			       "dentry: %s, %d\n", dentry->d_name.name, err);
 			goto out;
 		}
@@ -660,7 +660,7 @@ static int unionfs_read_super(struct super_block *sb, void *raw_data,
 	if (!odf_is_new(odf)) {
 		odf_options = odf_read_sb_data(odf, &bid);
 		if (IS_ERR(odf_options)) {
-			printk(KERN_WARNING "unionfs_read_super: could not "
+			printk(KERN_WARNING "unionfs: read_super: could not "
 			       "load options from odf\n");
 			err = PTR_ERR(odf_options);
 			odf_options = NULL;
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 9d5a4f584e..42577e36dd 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -483,7 +483,7 @@ int odf_rename(struct dentry *old_dentry, struct dentry *new_dentry)
 		goto out;
 
 	if (UNIONFS_D(old_dentry)->odf.dentry == NULL) {
-		printk(KERN_ERR "rename attempt %s to %s not in odf\n",
+		printk(KERN_ERR "unionfs: rename attempt %s to %s not in odf\n",
 		       old_dentry->d_name.name,
 		       new_dentry->d_name.name);
 		goto out;
@@ -1139,7 +1139,8 @@ struct dentry *__odf_lookup(struct dentry *parent,
 	odf_dentry = lookup_one_len(name, odf_parent, len);
 
 	if (IS_ERR(odf_dentry)) {
-		printk(KERN_ERR "odf_lookup: failed to lookup %s\n", name);
+		printk(KERN_ERR "unionfs: odf_lookup: failed to lookup %s\n",
+		       name);
 		goto out;
 	}
 
@@ -1204,8 +1205,8 @@ retry:
 				wake_up_and_wait_sioa(osi->cleanup);
 				goto retry;
 			}
-			printk(KERN_WARNING "odf_lookup: could not create odf"
-			       " dentry %s, %d\n", name, err);
+			printk(KERN_WARNING "unionfs: odf_lookup: could not "
+			       "create odf dentry %s, %d\n", name, err);
 			dput(odf_dentry);
 			odf_dentry = ERR_PTR(err);
 			goto out;
@@ -2100,7 +2101,7 @@ void __odf_cleanup(void *args)
 	if (cleanup)
 		err = odf_cleanup(cl->odf, cl->flags, b_size, i_size);
 	if (err < 0)
-		printk(KERN_WARNING "unionfs cleanup thread: error %d\n", err);
+		printk(KERN_WARNING "unionfs: cleanup thread: error %d\n", err);
 	else if (err == 0 && cl->success == 1)
 		printk(KERN_WARNING "unionfs: cleanup failed to bring odf "
 		       "below threshold\n");
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index f57b1f549b..00a71b4a4e 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -33,7 +33,7 @@ int copyup_empty_dir(struct inode *parent, struct dentry *dentry, int mode)
 		lower_dentry = create_parents(parent, dentry,
 					      dentry->d_name.name, bindex);
 		if (!lower_dentry || IS_ERR(lower_dentry)) {
-			pr_debug("lower dentry NULL for "
+			pr_debug("unionfs: lower dentry NULL for "
 				 "bindex = %d\n", bindex);
 			err = PTR_ERR(lower_dentry);
 			goto out;
diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
index 637dc75b35..f2b43f0547 100644
--- a/fs/unionfs/unlink.c
+++ b/fs/unionfs/unlink.c
@@ -64,7 +64,7 @@ static int unionfs_do_unlink(struct inode *dir, struct dentry *dentry)
 
 	if (err) {
 		if (err == -EIO)
-			printk(KERN_WARNING "unionfs_unlink: IO error "
+			printk(KERN_WARNING "unionfs: unlink: IO error "
 			       "unlinking from branch %d\n", bindex);
 		err = odf_create_wh(dentry);
 		if (err)
@@ -194,7 +194,7 @@ static int unionfs_do_rmdir(struct inode *dir, struct dentry *dentry)
 	 */
 	if (err || odf_get_opaque(dentry) != 1) {
 		if (err == -EIO)
-			printk(KERN_WARNING "unionfs_rmdir: IO error "
+			printk(KERN_WARNING "unionfs: rmdir: IO error "
 			       "removing from branch %d\n", bindex);
 		err = odf_create_wh(dentry);
 		if (err)