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 a6f8dfa18091759d7b5405037dfdf362010e0b45..8d42fa78f771f1c265839fb1c77781ca2308a193 100644 (file)
--- 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 0686c81b0fc8ae4187f94144059d57df9919c7ae..66ddfc69456af76df411d2a561d5d33327724ba6 100644 (file)
--- 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 9d5a4f584ef099061bbc8c54bfe402adb41618c2..42577e36dd0468daeef9969ae26103f11adaefc8 100644 (file)
--- 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 f57b1f549b0a97fa246c41d00aae3b39880dda59..00a71b4a4e79e67d161a9c1a8ce7c85149ee866c 100644 (file)
--- 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 637dc75b3565b8cfdb38ac00214aef4da8bd36e7..f2b43f0547844507101f0f5c04aa367bbab7be80 100644 (file)
--- 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)