Merge commit 'v2.6.37-rc1' into for-2.6.38

[firefly-linux-kernel-4.4.55.git] / include / linux / namei.h

diff --git a/include/linux/namei.h b/include/linux/namei.h
index 028946750289eaa9c7764c6d5cf77ee903c8da22..05b441d9364202ff09ccaa4db7ca28044db30290 100644 (file)
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -72,8 +72,6 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
 
 extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
                int (*open)(struct inode *, struct file *));
-extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
-extern void release_open_intent(struct nameidata *);
 
 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);