diff options
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index bf749cca4cc6..8eaa5ea1c613 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -1956,7 +1956,7 @@ out_no_task: | |||
1956 | } | 1956 | } |
1957 | 1957 | ||
1958 | static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry, | 1958 | static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry, |
1959 | struct nameidata *nd) | 1959 | unsigned int flags) |
1960 | { | 1960 | { |
1961 | return proc_lookupfd_common(dir, dentry, proc_fd_instantiate); | 1961 | return proc_lookupfd_common(dir, dentry, proc_fd_instantiate); |
1962 | } | 1962 | } |
@@ -2145,7 +2145,7 @@ proc_map_files_instantiate(struct inode *dir, struct dentry *dentry, | |||
2145 | } | 2145 | } |
2146 | 2146 | ||
2147 | static struct dentry *proc_map_files_lookup(struct inode *dir, | 2147 | static struct dentry *proc_map_files_lookup(struct inode *dir, |
2148 | struct dentry *dentry, struct nameidata *nd) | 2148 | struct dentry *dentry, unsigned int flags) |
2149 | { | 2149 | { |
2150 | unsigned long vm_start, vm_end; | 2150 | unsigned long vm_start, vm_end; |
2151 | struct vm_area_struct *vma; | 2151 | struct vm_area_struct *vma; |
@@ -2380,7 +2380,7 @@ static struct dentry *proc_fdinfo_instantiate(struct inode *dir, | |||
2380 | 2380 | ||
2381 | static struct dentry *proc_lookupfdinfo(struct inode *dir, | 2381 | static struct dentry *proc_lookupfdinfo(struct inode *dir, |
2382 | struct dentry *dentry, | 2382 | struct dentry *dentry, |
2383 | struct nameidata *nd) | 2383 | unsigned int flags) |
2384 | { | 2384 | { |
2385 | return proc_lookupfd_common(dir, dentry, proc_fdinfo_instantiate); | 2385 | return proc_lookupfd_common(dir, dentry, proc_fdinfo_instantiate); |
2386 | } | 2386 | } |
@@ -2630,7 +2630,7 @@ static const struct file_operations proc_attr_dir_operations = { | |||
2630 | }; | 2630 | }; |
2631 | 2631 | ||
2632 | static struct dentry *proc_attr_dir_lookup(struct inode *dir, | 2632 | static struct dentry *proc_attr_dir_lookup(struct inode *dir, |
2633 | struct dentry *dentry, struct nameidata *nd) | 2633 | struct dentry *dentry, unsigned int flags) |
2634 | { | 2634 | { |
2635 | return proc_pident_lookup(dir, dentry, | 2635 | return proc_pident_lookup(dir, dentry, |
2636 | attr_dir_stuff, ARRAY_SIZE(attr_dir_stuff)); | 2636 | attr_dir_stuff, ARRAY_SIZE(attr_dir_stuff)); |
@@ -3114,7 +3114,8 @@ static const struct file_operations proc_tgid_base_operations = { | |||
3114 | .llseek = default_llseek, | 3114 | .llseek = default_llseek, |
3115 | }; | 3115 | }; |
3116 | 3116 | ||
3117 | static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ | 3117 | static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) |
3118 | { | ||
3118 | return proc_pident_lookup(dir, dentry, | 3119 | return proc_pident_lookup(dir, dentry, |
3119 | tgid_base_stuff, ARRAY_SIZE(tgid_base_stuff)); | 3120 | tgid_base_stuff, ARRAY_SIZE(tgid_base_stuff)); |
3120 | } | 3121 | } |
@@ -3243,7 +3244,7 @@ out: | |||
3243 | return error; | 3244 | return error; |
3244 | } | 3245 | } |
3245 | 3246 | ||
3246 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) | 3247 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags) |
3247 | { | 3248 | { |
3248 | struct dentry *result; | 3249 | struct dentry *result; |
3249 | struct task_struct *task; | 3250 | struct task_struct *task; |
@@ -3470,7 +3471,8 @@ static int proc_tid_base_readdir(struct file * filp, | |||
3470 | tid_base_stuff,ARRAY_SIZE(tid_base_stuff)); | 3471 | tid_base_stuff,ARRAY_SIZE(tid_base_stuff)); |
3471 | } | 3472 | } |
3472 | 3473 | ||
3473 | static struct dentry *proc_tid_base_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ | 3474 | static struct dentry *proc_tid_base_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) |
3475 | { | ||
3474 | return proc_pident_lookup(dir, dentry, | 3476 | return proc_pident_lookup(dir, dentry, |
3475 | tid_base_stuff, ARRAY_SIZE(tid_base_stuff)); | 3477 | tid_base_stuff, ARRAY_SIZE(tid_base_stuff)); |
3476 | } | 3478 | } |
@@ -3514,7 +3516,7 @@ out: | |||
3514 | return error; | 3516 | return error; |
3515 | } | 3517 | } |
3516 | 3518 | ||
3517 | static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) | 3519 | static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags) |
3518 | { | 3520 | { |
3519 | struct dentry *result = ERR_PTR(-ENOENT); | 3521 | struct dentry *result = ERR_PTR(-ENOENT); |
3520 | struct task_struct *task; | 3522 | struct task_struct *task; |