commit 868811d541e13856a498e584edf5bd99e4d67287
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Thu Nov 1 01:38:09 2007 -0400
Unionfs: don't printk an error if it's due to common copyup
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 5ede405..8fcf33c 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -456,10 +456,11 @@ static int unionfs_symlink(struct inode *dir, struct
dentry *dentry,
if (!lower_dentry || IS_ERR(lower_dentry)) {
if (IS_ERR(lower_dentry))
err = PTR_ERR(lower_dentry);
-
- printk(KERN_ERR "unionfs: lower dentry "
- "NULL (or error) for bindex = %d\n",
- bindex);
+ if (!IS_COPYUP_ERR(err))
+ printk(KERN_ERR
+ "unionfs: create_parents for "
+ "symlink failed: bindex=%d "
+ "err=%d\n", bindex, err);
continue;
}
}
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index b1b756c..c4dcf8f 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -41,7 +41,7 @@ static int __unionfs_rename(struct inode *old_dir, struct
dentry *old_dentry,
bindex);
if (IS_ERR(lower_new_dentry)) {
err = PTR_ERR(lower_new_dentry);
- if (err == -EROFS)
+ if (IS_COPYUP_ERR(err))
goto out;
printk(KERN_ERR "unionfs: error creating directory "
"tree for rename, bindex=%d err=%d\n",
diff --git a/fs/unionfs/subr.c b/fs/unionfs/subr.c
index 8e84c0b..48f0072 100644
--- a/fs/unionfs/subr.c
+++ b/fs/unionfs/subr.c
@@ -60,8 +60,12 @@ int create_whiteout(struct dentry *dentry, int start)
dentry->d_name.name,
bindex);
if (!lower_dentry || IS_ERR(lower_dentry)) {
- printk(KERN_ERR "unionfs: create_parents "
- "failed for bindex = %d\n", bindex);
+ int ret = PTR_ERR(lower_dentry);
+ if (!IS_COPYUP_ERR(ret))
+ printk(KERN_ERR
+ "unionfs: create_parents for "
+ "whiteout failed: bindex=%d "
+ "err=%d\n", bindex, ret);
continue;
}
}
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
