commit 3f72dc2a71264fbcd19eef9c1fbbdc826168cc4c
Author: Erez Zadok <[EMAIL PROTECTED](none)>
Date: Sun Apr 15 17:37:40 2007 -0400
cleanup: rename prefix our version of double_lock_dentry with "unionfs_"
To avoid potential confusion with the VFS function of the same name (and
also confusion with ctags), rename our special version of double_lock_dentry
to unionfs_double_lock_dentry.
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index b327032..799884d 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -154,7 +154,7 @@ static int unionfs_link(struct dentry *old_dentry, struct
inode *dir,
BUG_ON(!is_valid_dentry(new_dentry));
BUG_ON(!is_valid_dentry(old_dentry));
- double_lock_dentry(new_dentry, old_dentry);
+ unionfs_double_lock_dentry(new_dentry, old_dentry);
hidden_new_dentry = unionfs_lower_dentry(new_dentry);
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 92ffe11..d1ebe25 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -328,7 +328,7 @@ int unionfs_rename(struct inode *old_dir, struct dentry
*old_dentry,
BUG_ON(!is_valid_dentry(old_dentry));
BUG_ON(!is_valid_dentry(new_dentry));
- double_lock_dentry(old_dentry, new_dentry);
+ unionfs_double_lock_dentry(old_dentry, new_dentry);
if (!S_ISDIR(old_dentry->d_inode->i_mode))
err = unionfs_partial_lookup(old_dentry);
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 2e8f90d..56e0528 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -264,7 +264,8 @@ static inline off_t rdstate2offset(struct unionfs_dir_state
*buf)
#define unionfs_write_lock(sb) down_write(&UNIONFS_SB(sb)->rwsem)
#define unionfs_write_unlock(sb) up_write(&UNIONFS_SB(sb)->rwsem)
-static inline void double_lock_dentry(struct dentry *d1, struct dentry *d2)
+static inline void unionfs_double_lock_dentry(struct dentry *d1,
+ struct dentry *d2)
{
if (d2 < d1) {
struct dentry *tmp = d1;
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
