commit a164eacd8fed4495468df87d698163f2c770ab84
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat Apr 21 12:06:11 2007 -0400
cleanup: rename our "do_rename" to __unionfs_rename.
To avoid confusion with the VFS-named function do_rename, and to help ctags,
rename our utility (static) function "do_rename" to "__unionfs_rename".
Conflicts:
fs/unionfs/rename.c
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index d1ebe25..fd07d94 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -66,7 +66,7 @@ out:
return err;
}
-static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
+static int __unionfs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry,
int bindex)
{
@@ -130,7 +130,7 @@ out_nofix:
/*
* Main rename code. This is sufficienly complex, that it's documented in
* Docmentation/filesystems/unionfs/rename.txt. This routine calls
- * do_rename() above to perform some of the work.
+ * __unionfs_rename() above to perform some of the work.
*/
static int do_unionfs_rename(struct inode *old_dir,
struct dentry *old_dentry,
@@ -169,7 +169,7 @@ static int do_unionfs_rename(struct inode *old_dir,
/* Rename source to destination. */
for (bindex = old_bstart; bindex <= old_bend; bindex++) {
- err = do_rename(old_dir, old_dentry, new_dir, new_dentry,
bindex);
+ err = __unionfs_rename(old_dir, old_dentry, new_dir,
new_dentry, bindex);
if (err)
break;
}
@@ -204,7 +204,7 @@ static int do_unionfs_rename(struct inode *old_dir,
old_dentry, old_bstart, bindex, NULL,
old_dentry->d_inode->i_size);
if (!err)
- err = do_rename(old_dir, old_dentry, new_dir,
+ err = __unionfs_rename(old_dir, old_dentry,
new_dir,
new_dentry, bindex);
if (err)
goto revert;
@@ -267,7 +267,7 @@ revert:
goto revert_out;
}
- local_err = do_rename(new_dir, new_dentry, old_dir, old_dentry,
old_bstart);
+ local_err = __unionfs_rename(new_dir, new_dentry, old_dir, old_dentry,
old_bstart);
/* If we can't fix it, then we cop-out with -EIO. */
if (local_err) {
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
