stop passing nameidata to ->lookup()
Just the flags; only NFS cares even about that, but there are legitimate uses for such argument. And getting rid of that completely would require splitting ->lookup() into a couple of methods (at least), so let's leave that alone for now... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -1956,7 +1956,7 @@ out_no_task:
|
||||
}
|
||||
|
||||
static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
|
||||
struct nameidata *nd)
|
||||
unsigned int flags)
|
||||
{
|
||||
return proc_lookupfd_common(dir, dentry, proc_fd_instantiate);
|
||||
}
|
||||
@@ -2145,7 +2145,7 @@ proc_map_files_instantiate(struct inode *dir, struct dentry *dentry,
|
||||
}
|
||||
|
||||
static struct dentry *proc_map_files_lookup(struct inode *dir,
|
||||
struct dentry *dentry, struct nameidata *nd)
|
||||
struct dentry *dentry, unsigned int flags)
|
||||
{
|
||||
unsigned long vm_start, vm_end;
|
||||
struct vm_area_struct *vma;
|
||||
@@ -2380,7 +2380,7 @@ static struct dentry *proc_fdinfo_instantiate(struct inode *dir,
|
||||
|
||||
static struct dentry *proc_lookupfdinfo(struct inode *dir,
|
||||
struct dentry *dentry,
|
||||
struct nameidata *nd)
|
||||
unsigned int flags)
|
||||
{
|
||||
return proc_lookupfd_common(dir, dentry, proc_fdinfo_instantiate);
|
||||
}
|
||||
@@ -2630,7 +2630,7 @@ static const struct file_operations proc_attr_dir_operations = {
|
||||
};
|
||||
|
||||
static struct dentry *proc_attr_dir_lookup(struct inode *dir,
|
||||
struct dentry *dentry, struct nameidata *nd)
|
||||
struct dentry *dentry, unsigned int flags)
|
||||
{
|
||||
return proc_pident_lookup(dir, dentry,
|
||||
attr_dir_stuff, ARRAY_SIZE(attr_dir_stuff));
|
||||
@@ -3114,7 +3114,8 @@ static const struct file_operations proc_tgid_base_operations = {
|
||||
.llseek = default_llseek,
|
||||
};
|
||||
|
||||
static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
|
||||
static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
|
||||
{
|
||||
return proc_pident_lookup(dir, dentry,
|
||||
tgid_base_stuff, ARRAY_SIZE(tgid_base_stuff));
|
||||
}
|
||||
@@ -3243,7 +3244,7 @@ out:
|
||||
return error;
|
||||
}
|
||||
|
||||
struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
|
||||
struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)
|
||||
{
|
||||
struct dentry *result;
|
||||
struct task_struct *task;
|
||||
@@ -3470,7 +3471,8 @@ static int proc_tid_base_readdir(struct file * filp,
|
||||
tid_base_stuff,ARRAY_SIZE(tid_base_stuff));
|
||||
}
|
||||
|
||||
static struct dentry *proc_tid_base_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
|
||||
static struct dentry *proc_tid_base_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
|
||||
{
|
||||
return proc_pident_lookup(dir, dentry,
|
||||
tid_base_stuff, ARRAY_SIZE(tid_base_stuff));
|
||||
}
|
||||
@@ -3514,7 +3516,7 @@ out:
|
||||
return error;
|
||||
}
|
||||
|
||||
static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
|
||||
static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)
|
||||
{
|
||||
struct dentry *result = ERR_PTR(-ENOENT);
|
||||
struct task_struct *task;
|
||||
|
@@ -446,7 +446,7 @@ out_unlock:
|
||||
}
|
||||
|
||||
struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
|
||||
struct nameidata *nd)
|
||||
unsigned int flags)
|
||||
{
|
||||
return proc_lookup_de(PDE(dir), dir, dentry);
|
||||
}
|
||||
|
@@ -106,7 +106,7 @@ void pde_users_dec(struct proc_dir_entry *pde);
|
||||
|
||||
extern spinlock_t proc_subdir_lock;
|
||||
|
||||
struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *);
|
||||
struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsigned int);
|
||||
int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir);
|
||||
unsigned long task_vsize(struct mm_struct *);
|
||||
unsigned long task_statm(struct mm_struct *,
|
||||
@@ -132,7 +132,7 @@ int proc_remount(struct super_block *sb, int *flags, char *data);
|
||||
* of the /proc/<pid> subdirectories.
|
||||
*/
|
||||
int proc_readdir(struct file *, void *, filldir_t);
|
||||
struct dentry *proc_lookup(struct inode *, struct dentry *, struct nameidata *);
|
||||
struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
|
||||
|
||||
|
||||
|
||||
|
@@ -140,7 +140,7 @@ const struct file_operations proc_ns_dir_operations = {
|
||||
};
|
||||
|
||||
static struct dentry *proc_ns_dir_lookup(struct inode *dir,
|
||||
struct dentry *dentry, struct nameidata *nd)
|
||||
struct dentry *dentry, unsigned int flags)
|
||||
{
|
||||
struct dentry *error;
|
||||
struct task_struct *task = get_proc_task(dir);
|
||||
|
@@ -119,7 +119,7 @@ static struct net *get_proc_task_net(struct inode *dir)
|
||||
}
|
||||
|
||||
static struct dentry *proc_tgid_net_lookup(struct inode *dir,
|
||||
struct dentry *dentry, struct nameidata *nd)
|
||||
struct dentry *dentry, unsigned int flags)
|
||||
{
|
||||
struct dentry *de;
|
||||
struct net *net;
|
||||
|
@@ -433,7 +433,7 @@ static struct ctl_table_header *grab_header(struct inode *inode)
|
||||
}
|
||||
|
||||
static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
|
||||
struct nameidata *nd)
|
||||
unsigned int flags)
|
||||
{
|
||||
struct ctl_table_header *head = grab_header(dir);
|
||||
struct ctl_table_header *h = NULL;
|
||||
|
@@ -200,13 +200,12 @@ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd)
|
||||
static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags)
|
||||
{
|
||||
if (!proc_lookup(dir, dentry, nd)) {
|
||||
if (!proc_lookup(dir, dentry, flags))
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return proc_pid_lookup(dir, dentry, nd);
|
||||
return proc_pid_lookup(dir, dentry, flags);
|
||||
}
|
||||
|
||||
static int proc_root_readdir(struct file * filp,
|
||||
|
Reference in New Issue
Block a user