commit 4241fa8ba7ac3061b3714f1220da7c428921bab1
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat Apr 21 11:42:53 2007 -0400
cleanup: every printk should prefix with "unionfs: " consistently
Conflicts:
fs/unionfs/inode.c
fs/unionfs/lookup.c
fs/unionfs/rename.c
fs/unionfs/subr.c
diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index
3dd2192ff926cfec01c7445bfdda17727bb8f842..53cafa8a6ddb3fc52ba722dbde181beb381bcd1e
100644
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -416,8 +416,8 @@ int unionfs_file_revalidate(struct file
if (willwrite && IS_WRITE_FLAG(file->f_flags) &&
!IS_WRITE_FLAG(unionfs_lower_file(file)->f_flags) &&
is_robranch(dentry)) {
- printk(KERN_DEBUG "Doing delayed copyup of a read-write "
- "file on a read-only branch.\n");
+ printk(KERN_DEBUG "unionfs: Doing delayed copyup of a "
+ "read-write file on a read-only branch.\n");
err = do_delayed_copyup(file, dentry);
}
@@ -645,7 +645,8 @@ int unionfs_file_release(struct inode *i
if (fileinfo->rdstate) {
fileinfo->rdstate->access = jiffies;
- printk(KERN_DEBUG "Saving rdstate with cookie %u [%d.%lld]\n",
+ printk(KERN_DEBUG "unionfs: saving rdstate with cookie "
+ "%u [%d.%lld]\n",
fileinfo->rdstate->cookie,
fileinfo->rdstate->bindex,
(long long)fileinfo->rdstate->dirpos);
diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index
9313535b209be07bb752f38081f57c7c0f8a0cd2..1225cddac02908e4b73e8b7be7a39c61f36a0410
100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -183,7 +183,7 @@ static int __copyup_ndentry(struct dentr
run_sioq(__unionfs_create, &args);
err = args.err;
} else {
- printk(KERN_ERR "Unknown inode type %d\n",
+ printk(KERN_ERR "unionfs: unknown inode type %d\n",
old_mode);
BUG();
}
diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index
ab3f9e64031852d9b4bcdffe0755147707098627..07c67da9e086d24a0613fc5970dd7282935c3572
100644
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -48,7 +48,8 @@ static int __unionfs_d_revalidate_one(st
/* if the dentry is unhashed, do NOT revalidate */
if (d_deleted(dentry)) {
- printk(KERN_DEBUG "unhashed dentry being revalidated: %*s\n",
+ printk(KERN_DEBUG "unionfs: unhashed dentry being "
+ "revalidated: %*s\n",
dentry->d_name.len, dentry->d_name.name);
goto out;
}
@@ -291,12 +292,13 @@ static void unionfs_d_release(struct den
/* this could be a negative dentry, so check first */
if (!UNIONFS_D(dentry)) {
- printk(KERN_DEBUG "dentry without private data: %.*s",
+ printk(KERN_DEBUG "unionfs: dentry without private data: %.*s",
dentry->d_name.len, dentry->d_name.name);
goto out;
} else if (dbstart(dentry) < 0) {
/* this is due to a failed lookup */
- printk(KERN_DEBUG "dentry without hidden dentries : %.*s",
+ printk(KERN_DEBUG "unionfs: dentry without hidden "
+ "dentries: %.*s",
dentry->d_name.len, dentry->d_name.name);
goto out_free;
}
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index
5f7a92fe51011357854ea1f9f8947a0d75abb2b4..5940c8b0455dd37f3cc4152825f8968b15c35104
100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -160,7 +160,7 @@ skip:
/* Do nothing. */
break;
default:
- printk(KERN_ERR "Invalid interpose flag passed!");
+ printk(KERN_ERR "unionfs: invalid interpose flag passed!");
BUG();
}
@@ -550,7 +550,7 @@ static int unionfs_read_super(struct sup
if (!raw_data) {
printk(KERN_WARNING
- "unionfs_read_super: missing data argument\n");
+ "unionfs: read_super: missing data argument\n");
err = -EINVAL;
goto out;
}
@@ -558,7 +558,7 @@ static int unionfs_read_super(struct sup
/* Allocate superblock private data */
sb->s_fs_info = kzalloc(sizeof(struct unionfs_sb_info), GFP_KERNEL);
if (!UNIONFS_SB(sb)) {
- printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
+ printk(KERN_WARNING "unionfs: read_super: out of memory\n");
err = -ENOMEM;
goto out;
}
@@ -601,7 +601,7 @@ static int unionfs_read_super(struct sup
hidden_root_info = unionfs_parse_options(sb, raw_data);
if (IS_ERR(hidden_root_info)) {
printk(KERN_WARNING
- "unionfs_read_super: error while parsing options "
+ "unionfs: read_super: error while parsing options "
"(err = %ld)\n", PTR_ERR(hidden_root_info));
err = PTR_ERR(hidden_root_info);
hidden_root_info = NULL;
diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c
index
b9e731a3c3ea0c4b44f00980fa5b9e30ebfe62e9..3dc1dc2eab9348103651a18a036c3a2b8c6810f6
100644
--- a/fs/unionfs/rdstate.c
+++ b/fs/unionfs/rdstate.c
@@ -210,8 +210,8 @@ struct filldir_node *find_filldir_node(s
* system is corrupted.
*/
if (cursor->bindex == rdstate->bindex) {
- printk(KERN_DEBUG "Possible I/O error "
- "unionfs_filldir: a file is duplicated "
+ printk(KERN_DEBUG "unionfs: filldir: possible "
+ "I/O error: a file is duplicated "
"in the same branch %d: %s\n",
rdstate->bindex, cursor->name);
}
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index
1ede0119d3ab1a425a737b1a1aedf566b5b2eefe..950b557351ccc655bf271e41d76e0871c267c75c
100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -85,8 +85,8 @@ static int do_rename(struct inode *old_d
hidden_new_dentry =
create_parents(new_dentry->d_parent->d_inode,
new_dentry, bindex);
if (IS_ERR(hidden_new_dentry)) {
- printk(KERN_DEBUG "error creating directory tree for"
- " rename, bindex = %d, err = %ld\n",
+ printk(KERN_DEBUG "unionfs: error creating directory "
+ "tree for rename, bindex = %d, err = %ld\n",
bindex, PTR_ERR(hidden_new_dentry));
err = PTR_ERR(hidden_new_dentry);
goto out;
@@ -232,31 +232,31 @@ revert:
/* Do revert here. */
local_err = unionfs_refresh_hidden_dentry(new_dentry, old_bstart);
if (local_err) {
- printk(KERN_WARNING "Revert failed in rename: the new refresh "
- "failed.\n");
+ printk(KERN_WARNING "unionfs: revert failed in rename: "
+ "the new refresh failed.\n");
eio = -EIO;
}
local_err = unionfs_refresh_hidden_dentry(old_dentry, old_bstart);
if (local_err) {
- printk(KERN_WARNING "Revert failed in rename: the old refresh "
- "failed.\n");
+ printk(KERN_WARNING "unionfs: revert failed in rename: "
+ "the old refresh failed.\n");
eio = -EIO;
goto revert_out;
}
if (!unionfs_lower_dentry_idx(new_dentry, bindex) ||
!unionfs_lower_dentry_idx(new_dentry, bindex)->d_inode) {
- printk(KERN_WARNING "Revert failed in rename: the object "
- "disappeared from under us!\n");
+ printk(KERN_WARNING "unionfs: revert failed in rename: "
+ "the object disappeared from under us!\n");
eio = -EIO;
goto revert_out;
}
if (unionfs_lower_dentry_idx(old_dentry, bindex) &&
unionfs_lower_dentry_idx(old_dentry, bindex)->d_inode) {
- printk(KERN_WARNING "Revert failed in rename: the object was "
- "created underneath us!\n");
+ printk(KERN_WARNING "unionfs: revert failed in rename: "
+ "the object was created underneath us!\n");
eio = -EIO;
goto revert_out;
}
@@ -265,7 +265,7 @@ revert:
/* If we can't fix it, then we cop-out with -EIO. */
if (local_err) {
- printk(KERN_WARNING "Revert failed in rename!\n");
+ printk(KERN_WARNING "unionfs: revert failed in rename!\n");
eio = -EIO;
}
diff --git a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
index
e7e1af91936fdd2beded6c6d43d9f0f943f47b4f..da0e72250c3d0daa6e9ead0cbc1c39813182cc63
100644
--- a/fs/unionfs/sioq.c
+++ b/fs/unionfs/sioq.c
@@ -35,7 +35,7 @@ int __init init_sioq(void)
return 0;
err = PTR_ERR(superio_workqueue);
- printk(KERN_ERR "create_workqueue failed %d\n", err);
+ printk(KERN_ERR "unionfs: create_workqueue failed %d\n", err);
superio_workqueue = NULL;
return err;
}
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index
603f14f8171570644023b1e4b74c599f38aa413e..b56b5360ef20a72e91a2552bfe6105ee57a9def5
100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -30,8 +30,8 @@ static void unionfs_read_inode(struct in
struct unionfs_inode_info *info = UNIONFS_I(inode);
if (!info) {
- printk(KERN_ERR "No kernel memory when allocating inode "
- "private data!\n");
+ printk(KERN_ERR "unionfs: no kernel memory when allocating "
+ "inode private data!\n");
BUG();
}
@@ -48,8 +48,8 @@ static void unionfs_read_inode(struct in
size = sbmax(inode->i_sb) * sizeof(struct inode *);
info->lower_inodes = kzalloc(size, GFP_KERNEL);
if (!info->lower_inodes) {
- printk(KERN_ERR "No kernel memory when allocating lower-"
- "pointer array!\n");
+ printk(KERN_ERR "unionfs: no kernel memory when allocating "
+ "lower-pointer array!\n");
BUG();
}
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
