diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2012-06-05 09:10:27 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 08:33:18 -0400 |
commit | 015c3bbcd88df2305aae5b017a9c91c08b380aa1 (patch) | |
tree | 25f5e936ad16eddda39477a64addb4b54970bbd2 /include/linux | |
parent | e43ae79c540270865918dab5ac914c74f43101e2 (diff) |
vfs: remove open intents from nameidata
All users of open intents have been converted to use ->atomic_{open,create}.
This patch gets rid of nd->intent.open and related infrastructure.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/namei.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/namei.h b/include/linux/namei.h index ffc02135c483..23d859879210 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h | |||
@@ -7,12 +7,6 @@ | |||
7 | 7 | ||
8 | struct vfsmount; | 8 | struct vfsmount; |
9 | 9 | ||
10 | struct open_intent { | ||
11 | int flags; | ||
12 | int create_mode; | ||
13 | struct file *file; | ||
14 | }; | ||
15 | |||
16 | enum { MAX_NESTED_LINKS = 8 }; | 10 | enum { MAX_NESTED_LINKS = 8 }; |
17 | 11 | ||
18 | struct nameidata { | 12 | struct nameidata { |
@@ -25,11 +19,6 @@ struct nameidata { | |||
25 | int last_type; | 19 | int last_type; |
26 | unsigned depth; | 20 | unsigned depth; |
27 | char *saved_names[MAX_NESTED_LINKS + 1]; | 21 | char *saved_names[MAX_NESTED_LINKS + 1]; |
28 | |||
29 | /* Intent data */ | ||
30 | union { | ||
31 | struct open_intent open; | ||
32 | } intent; | ||
33 | }; | 22 | }; |
34 | 23 | ||
35 | /* | 24 | /* |
@@ -82,9 +71,6 @@ extern int kern_path_parent(const char *, struct nameidata *); | |||
82 | extern int vfs_path_lookup(struct dentry *, struct vfsmount *, | 71 | extern int vfs_path_lookup(struct dentry *, struct vfsmount *, |
83 | const char *, unsigned int, struct path *); | 72 | const char *, unsigned int, struct path *); |
84 | 73 | ||
85 | extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, | ||
86 | int (*open)(struct inode *, struct file *)); | ||
87 | |||
88 | extern struct dentry *lookup_one_len(const char *, struct dentry *, int); | 74 | extern struct dentry *lookup_one_len(const char *, struct dentry *, int); |
89 | 75 | ||
90 | extern int follow_down_one(struct path *); | 76 | extern int follow_down_one(struct path *); |