Unionfs odf: Remove unnecessary function and macro

Signed-off-by: Rachita Kothiyal <rachita@fsl.cs.sunysb.edu>

diff --git a/fs/unionfs/fanout.h b/fs/unionfs/fanout.h
index 2ae30a34d4245c750062756dcc987b105aa1e295..20399dd0fa706f6ab78709c481f7eb776cda8d65 100644 (file)
--- a/fs/unionfs/fanout.h
+++ b/fs/unionfs/fanout.h
@@ -282,7 +282,6 @@ enum unionfs_dentry_lock_class {
        UNIONFS_DMUTEX_ROOT,
        UNIONFS_DMUTEX_PARENT,
        UNIONFS_DMUTEX_CHILD,
-       UNIONFS_DMUTEX_WHITEOUT,
        UNIONFS_DMUTEX_REVAL_PARENT, /* for file/dentry revalidate */
        UNIONFS_DMUTEX_REVAL_CHILD,   /* for file/dentry revalidate */
 };

diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index a35301c9dbadb482d1e0b137902d093c508519af..315fe2302c47b25f00f74495747014f648f3c1f8 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -492,13 +492,6 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
        mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
        return dir;
 }
-static inline struct dentry *lock_parent_wh(struct dentry *dentry)
-{
-       struct dentry *dir = dget(dentry->d_parent);
-
-       mutex_lock_nested(&dir->d_inode->i_mutex, UNIONFS_DMUTEX_WHITEOUT);
-       return dir;
-}
 
 static inline void unlock_dir(struct dentry *dir)
 {