hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d
kernel/fs/proc/self.c
....@@ -12,16 +12,9 @@
1212 struct inode *inode,
1313 struct delayed_call *done)
1414 {
15
- struct pid_namespace *ns = proc_pid_ns(inode);
15
+ struct pid_namespace *ns = proc_pid_ns(inode->i_sb);
1616 pid_t tgid = task_tgid_nr_ns(current, ns);
1717 char *name;
18
-
19
- /*
20
- * Not currently supported. Once we can inherit all of struct pid,
21
- * we can allow this.
22
- */
23
- if (current->flags & PF_KTHREAD)
24
- return ERR_PTR(-EOPNOTSUPP);
2518
2619 if (!tgid)
2720 return ERR_PTR(-ENOENT);
....@@ -43,9 +36,10 @@
4336 int proc_setup_self(struct super_block *s)
4437 {
4538 struct inode *root_inode = d_inode(s->s_root);
46
- struct pid_namespace *ns = proc_pid_ns(root_inode);
39
+ struct proc_fs_info *fs_info = proc_sb_info(s);
4740 struct dentry *self;
48
-
41
+ int ret = -ENOMEM;
42
+
4943 inode_lock(root_inode);
5044 self = d_alloc_name(s->s_root, "self");
5145 if (self) {
....@@ -58,20 +52,19 @@
5852 inode->i_gid = GLOBAL_ROOT_GID;
5953 inode->i_op = &proc_self_inode_operations;
6054 d_add(self, inode);
55
+ ret = 0;
6156 } else {
6257 dput(self);
63
- self = ERR_PTR(-ENOMEM);
6458 }
65
- } else {
66
- self = ERR_PTR(-ENOMEM);
6759 }
6860 inode_unlock(root_inode);
69
- if (IS_ERR(self)) {
61
+
62
+ if (ret)
7063 pr_err("proc_fill_super: can't allocate /proc/self\n");
71
- return PTR_ERR(self);
72
- }
73
- ns->proc_self = self;
74
- return 0;
64
+ else
65
+ fs_info->proc_self = self;
66
+
67
+ return ret;
7568 }
7669
7770 void __init proc_self_init(void)