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 ecf0616963f2949cffe43a4187bd3073895614b8..872a6e636c98f6bbb0848ac5fdab481970fbbe0f 100644 (file)
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -265,7 +265,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 231866ef8d1b183603b68cac6d16d6e4393531cc..0e1e71a6e6e5536ce392ea5b659f4581b1563850 100644 (file)
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -400,7 +400,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 8d401243a22a9b95af94407741354ae8a05f9c8e..36522773119c23fe95ef3edb0197adb8b2708bdc 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -223,7 +223,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;