diff options
author | James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/linux/namei.h | |
parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/namei.h')
-rw-r--r-- | include/linux/namei.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/namei.h b/include/linux/namei.h index ec0f607b364..05b441d9364 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -72,11 +72,8 @@ 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); -extern struct dentry *lookup_one_noperm(const char *, struct dentry *); extern int follow_down(struct path *); extern int follow_up(struct path *); |