From 4594d4bc1e4d95ce25a9337ed8ab5c9f16e7a4f7 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Sun, 15 Apr 2007 17:37:40 -0400 Subject: [PATCH] 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. --- fs/unionfs/inode.c | 2 +- fs/unionfs/rename.c | 2 +- fs/unionfs/union.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c index ecf0616963f..872a6e636c9 100644 --- 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 231866ef8d1..0e1e71a6e6e 100644 --- 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 8d401243a22..36522773119 100644 --- 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; -- 2.43.0