switch ->get_link() to delayed_call, kill ->put_link()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -1565,7 +1565,8 @@ static int proc_exe_link(struct dentry *dentry, struct path *exe_path)
|
||||
}
|
||||
|
||||
static const char *proc_pid_get_link(struct dentry *dentry,
|
||||
struct inode *inode, void **cookie)
|
||||
struct inode *inode,
|
||||
struct delayed_call *done)
|
||||
{
|
||||
struct path path;
|
||||
int error = -EACCES;
|
||||
@@ -1949,12 +1950,13 @@ struct map_files_info {
|
||||
*/
|
||||
static const char *
|
||||
proc_map_files_get_link(struct dentry *dentry,
|
||||
struct inode *inode, void **cookie)
|
||||
struct inode *inode,
|
||||
struct delayed_call *done)
|
||||
{
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
return ERR_PTR(-EPERM);
|
||||
|
||||
return proc_pid_get_link(dentry, inode, NULL);
|
||||
return proc_pid_get_link(dentry, inode, done);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -393,25 +393,25 @@ static const struct file_operations proc_reg_file_ops_no_compat = {
|
||||
};
|
||||
#endif
|
||||
|
||||
static void proc_put_link(void *p)
|
||||
{
|
||||
unuse_pde(p);
|
||||
}
|
||||
|
||||
static const char *proc_get_link(struct dentry *dentry,
|
||||
struct inode *inode, void **cookie)
|
||||
struct inode *inode,
|
||||
struct delayed_call *done)
|
||||
{
|
||||
struct proc_dir_entry *pde = PDE(inode);
|
||||
if (unlikely(!use_pde(pde)))
|
||||
return ERR_PTR(-EINVAL);
|
||||
*cookie = pde;
|
||||
set_delayed_call(done, proc_put_link, pde);
|
||||
return pde->data;
|
||||
}
|
||||
|
||||
static void proc_put_link(struct inode *unused, void *p)
|
||||
{
|
||||
unuse_pde(p);
|
||||
}
|
||||
|
||||
const struct inode_operations proc_link_inode_operations = {
|
||||
.readlink = generic_readlink,
|
||||
.get_link = proc_get_link,
|
||||
.put_link = proc_put_link,
|
||||
};
|
||||
|
||||
struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
|
||||
|
||||
@@ -31,7 +31,8 @@ static const struct proc_ns_operations *ns_entries[] = {
|
||||
};
|
||||
|
||||
static const char *proc_ns_get_link(struct dentry *dentry,
|
||||
struct inode *inode, void **cookie)
|
||||
struct inode *inode,
|
||||
struct delayed_call *done)
|
||||
{
|
||||
const struct proc_ns_operations *ns_ops = PROC_I(inode)->ns_ops;
|
||||
struct task_struct *task;
|
||||
|
||||
@@ -19,7 +19,8 @@ static int proc_self_readlink(struct dentry *dentry, char __user *buffer,
|
||||
}
|
||||
|
||||
static const char *proc_self_get_link(struct dentry *dentry,
|
||||
struct inode *inode, void **cookie)
|
||||
struct inode *inode,
|
||||
struct delayed_call *done)
|
||||
{
|
||||
struct pid_namespace *ns = inode->i_sb->s_fs_info;
|
||||
pid_t tgid = task_tgid_nr_ns(current, ns);
|
||||
@@ -32,13 +33,13 @@ static const char *proc_self_get_link(struct dentry *dentry,
|
||||
if (unlikely(!name))
|
||||
return dentry ? ERR_PTR(-ENOMEM) : ERR_PTR(-ECHILD);
|
||||
sprintf(name, "%d", tgid);
|
||||
return *cookie = name;
|
||||
set_delayed_call(done, kfree_link, name);
|
||||
return name;
|
||||
}
|
||||
|
||||
static const struct inode_operations proc_self_inode_operations = {
|
||||
.readlink = proc_self_readlink,
|
||||
.get_link = proc_self_get_link,
|
||||
.put_link = kfree_put_link,
|
||||
};
|
||||
|
||||
static unsigned self_inum;
|
||||
|
||||
@@ -20,7 +20,8 @@ static int proc_thread_self_readlink(struct dentry *dentry, char __user *buffer,
|
||||
}
|
||||
|
||||
static const char *proc_thread_self_get_link(struct dentry *dentry,
|
||||
struct inode *inode, void **cookie)
|
||||
struct inode *inode,
|
||||
struct delayed_call *done)
|
||||
{
|
||||
struct pid_namespace *ns = inode->i_sb->s_fs_info;
|
||||
pid_t tgid = task_tgid_nr_ns(current, ns);
|
||||
@@ -34,13 +35,13 @@ static const char *proc_thread_self_get_link(struct dentry *dentry,
|
||||
if (unlikely(!name))
|
||||
return dentry ? ERR_PTR(-ENOMEM) : ERR_PTR(-ECHILD);
|
||||
sprintf(name, "%d/task/%d", tgid, pid);
|
||||
return *cookie = name;
|
||||
set_delayed_call(done, kfree_link, name);
|
||||
return name;
|
||||
}
|
||||
|
||||
static const struct inode_operations proc_thread_self_inode_operations = {
|
||||
.readlink = proc_thread_self_readlink,
|
||||
.get_link = proc_thread_self_get_link,
|
||||
.put_link = kfree_put_link,
|
||||
};
|
||||
|
||||
static unsigned thread_self_inum;
|
||||
|
||||
Reference in New Issue
Block a user