diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-04-06 11:16:22 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-05-09 10:49:42 -0400 |
commit | 6e8341a11eb21826b7192d0bb88cb5b44900a9af (patch) | |
tree | f9e03050f0834c2c4a21f1e6a255b6b0d1262b25 /include | |
parent | a44ddbb6d8a8ffe4e34e417048dfdd8f3dd1de4f (diff) |
Switch open_exec() and sys_uselib() to do_open_filp()
... and make path_lookup_open() static
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fs.h | 2 | ||||
-rw-r--r-- | include/linux/namei.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 11484d08042c..ed788426f464 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -2118,7 +2118,7 @@ extern struct file *create_write_pipe(int flags); | |||
2118 | extern void free_write_pipe(struct file *); | 2118 | extern void free_write_pipe(struct file *); |
2119 | 2119 | ||
2120 | extern struct file *do_filp_open(int dfd, const char *pathname, | 2120 | extern struct file *do_filp_open(int dfd, const char *pathname, |
2121 | int open_flag, int mode); | 2121 | int open_flag, int mode, int acc_mode); |
2122 | extern int may_open(struct path *, int, int); | 2122 | extern int may_open(struct path *, int, int); |
2123 | 2123 | ||
2124 | extern int kernel_read(struct file *, unsigned long, char *, unsigned long); | 2124 | extern int kernel_read(struct file *, unsigned long, char *, unsigned long); |
diff --git a/include/linux/namei.h b/include/linux/namei.h index fc2e03579877..518098fe63af 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h | |||
@@ -69,7 +69,6 @@ extern int path_lookup(const char *, unsigned, struct nameidata *); | |||
69 | extern int vfs_path_lookup(struct dentry *, struct vfsmount *, | 69 | extern int vfs_path_lookup(struct dentry *, struct vfsmount *, |
70 | const char *, unsigned int, struct nameidata *); | 70 | const char *, unsigned int, struct nameidata *); |
71 | 71 | ||
72 | extern int path_lookup_open(int dfd, const char *name, unsigned lookup_flags, struct nameidata *, int open_flags); | ||
73 | extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, | 72 | extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, |
74 | int (*open)(struct inode *, struct file *)); | 73 | int (*open)(struct inode *, struct file *)); |
75 | extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); | 74 | extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); |