commit f6ffe6bd1ad25d1597d241ad4a74a8b3c6e94b65
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
c175b1c5dc03d461fc8552c91c4e208a258b1c15..2f0876da5735fd721c25c66f0bb74dc74b2f7ebf
100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -155,7 +155,7 @@ static int unionfs_link(struct dentry *o
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
92ffe1140d1efaeef4c187da58b5b32093e56dcf..d1ebe256755dd0d7d5d928e778055e56b1aa29f4
100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -328,7 +328,7 @@ int unionfs_rename(struct inode *old_dir
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
edda95bf83ae99fb2b9563b007431c34b2de0ad9..425a732b6dfa3f902ed5488e4bec7d0d4af70d96
100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -253,7 +253,8 @@ #define unionfs_read_unlock(sb) up_read
#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
