proc: proc_pid_ns takes super_block as an argument

[platform/kernel/linux-starfive.git] / fs / proc / thread_self.c

diff --git a/fs/proc/thread_self.c b/fs/proc/thread_self.c
index f61ae53..ac284f4 100644 (file)
--- a/fs/proc/thread_self.c
+++ b/fs/proc/thread_self.c
@@ -12,7 +12,7 @@ static const char *proc_thread_self_get_link(struct dentry *dentry,
                                             struct inode *inode,
                                             struct delayed_call *done)
 {
-       struct pid_namespace *ns = proc_pid_ns(inode);
+       struct pid_namespace *ns = proc_pid_ns(inode->i_sb);
        pid_t tgid = task_tgid_nr_ns(current, ns);
        pid_t pid = task_pid_nr_ns(current, ns);
        char *name;
@@ -36,7 +36,7 @@ static unsigned thread_self_inum __ro_after_init;
 int proc_setup_thread_self(struct super_block *s)
 {
        struct inode *root_inode = d_inode(s->s_root);
-       struct pid_namespace *ns = proc_pid_ns(root_inode);
+       struct proc_fs_info *fs_info = proc_sb_info(s);
        struct dentry *thread_self;
        int ret = -ENOMEM;
 
@@ -60,9 +60,9 @@ int proc_setup_thread_self(struct super_block *s)
        inode_unlock(root_inode);
 
        if (ret)
-               pr_err("proc_fill_super: can't allocate /proc/thread_self\n");
+               pr_err("proc_fill_super: can't allocate /proc/thread-self\n");
        else
-               ns->proc_thread_self = thread_self;
+               fs_info->proc_thread_self = thread_self;
 
        return ret;
 }