Merge branch 'for-2.6.39' into for-2.6.40

1 files changed, 1 insertions, 2 deletions

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index f958c19e3ca5..f2afed4fa945 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -168,7 +168,7 @@ struct dentry_operations {
         void (*d_iput)(struct dentry *, struct inode *);
         char *(*d_dname)(struct dentry *, char *, int);
         struct vfsmount *(*d_automount)(struct path *);
-        int (*d_manage)(struct dentry *, bool, bool);
+        int (*d_manage)(struct dentry *, bool);
 } ____cacheline_aligned;
 
 /*
@@ -416,7 +416,6 @@ static inline bool d_mountpoint(struct dentry *dentry)
         return dentry->d_flags & DCACHE_MOUNTED;
 }
 
-extern struct vfsmount *lookup_mnt(struct path *);
 extern struct dentry *lookup_create(struct nameidata *nd, int is_dir);
 
 extern int sysctl_vfs_cache_pressure;