diff options
Diffstat (limited to 'fs/proc/root.c')
-rw-r--r-- | fs/proc/root.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 7c30fce037c..9a2d9fd7cad 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -111,7 +111,7 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, | |||
111 | options = data; | 111 | options = data; |
112 | } | 112 | } |
113 | 113 | ||
114 | sb = sget(fs_type, proc_test_super, proc_set_super, ns); | 114 | sb = sget(fs_type, proc_test_super, proc_set_super, flags, ns); |
115 | if (IS_ERR(sb)) | 115 | if (IS_ERR(sb)) |
116 | return ERR_CAST(sb); | 116 | return ERR_CAST(sb); |
117 | 117 | ||
@@ -121,7 +121,6 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, | |||
121 | } | 121 | } |
122 | 122 | ||
123 | if (!sb->s_root) { | 123 | if (!sb->s_root) { |
124 | sb->s_flags = flags; | ||
125 | err = proc_fill_super(sb); | 124 | err = proc_fill_super(sb); |
126 | if (err) { | 125 | if (err) { |
127 | deactivate_locked_super(sb); | 126 | deactivate_locked_super(sb); |
@@ -200,13 +199,12 @@ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct | |||
200 | return 0; | 199 | return 0; |
201 | } | 200 | } |
202 | 201 | ||
203 | static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd) | 202 | static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags) |
204 | { | 203 | { |
205 | if (!proc_lookup(dir, dentry, nd)) { | 204 | if (!proc_lookup(dir, dentry, flags)) |
206 | return NULL; | 205 | return NULL; |
207 | } | ||
208 | 206 | ||
209 | return proc_pid_lookup(dir, dentry, nd); | 207 | return proc_pid_lookup(dir, dentry, flags); |
210 | } | 208 | } |
211 | 209 | ||
212 | static int proc_root_readdir(struct file * filp, | 210 | static int proc_root_readdir(struct file * filp, |