diff options
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index c7f9f23449dc..acb7ef80ea4f 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -166,18 +166,6 @@ static int get_fs_path(struct task_struct *task, struct path *path, bool root) | |||
166 | return result; | 166 | return result; |
167 | } | 167 | } |
168 | 168 | ||
169 | static int get_nr_threads(struct task_struct *tsk) | ||
170 | { | ||
171 | unsigned long flags; | ||
172 | int count = 0; | ||
173 | |||
174 | if (lock_task_sighand(tsk, &flags)) { | ||
175 | count = atomic_read(&tsk->signal->count); | ||
176 | unlock_task_sighand(tsk, &flags); | ||
177 | } | ||
178 | return count; | ||
179 | } | ||
180 | |||
181 | static int proc_cwd_link(struct inode *inode, struct path *path) | 169 | static int proc_cwd_link(struct inode *inode, struct path *path) |
182 | { | 170 | { |
183 | struct task_struct *task = get_proc_task(inode); | 171 | struct task_struct *task = get_proc_task(inode); |
@@ -2444,7 +2432,7 @@ static struct dentry *proc_base_instantiate(struct inode *dir, | |||
2444 | const struct pid_entry *p = ptr; | 2432 | const struct pid_entry *p = ptr; |
2445 | struct inode *inode; | 2433 | struct inode *inode; |
2446 | struct proc_inode *ei; | 2434 | struct proc_inode *ei; |
2447 | struct dentry *error = ERR_PTR(-EINVAL); | 2435 | struct dentry *error; |
2448 | 2436 | ||
2449 | /* Allocate the inode */ | 2437 | /* Allocate the inode */ |
2450 | error = ERR_PTR(-ENOMEM); | 2438 | error = ERR_PTR(-ENOMEM); |
@@ -2794,7 +2782,7 @@ out: | |||
2794 | 2782 | ||
2795 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) | 2783 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) |
2796 | { | 2784 | { |
2797 | struct dentry *result = ERR_PTR(-ENOENT); | 2785 | struct dentry *result; |
2798 | struct task_struct *task; | 2786 | struct task_struct *task; |
2799 | unsigned tgid; | 2787 | unsigned tgid; |
2800 | struct pid_namespace *ns; | 2788 | struct pid_namespace *ns; |