From: Daniel Drake <dsd@gentoo.org>
The current logic assumes that a /proc/<PID>/task directory should have a
hardlink count of 3, probably counting ".", "..", and a directory for a
single child task.
It's fairly obvious that this doesn't work out correctly when a PID has
more than one child task, which is quite often the case.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
fs/proc/base.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff -puN fs/proc/base.c~procfs-fix-hardlink-counts-for-proc-pid-task fs/proc/base.c
--- 25/fs/proc/base.c~procfs-fix-hardlink-counts-for-proc-pid-task 2005-04-29 18:54:52.285195440 -0700
+++ 25-akpm/fs/proc/base.c 2005-04-29 18:54:52.291194528 -0700
@@ -1476,6 +1476,8 @@ static struct file_operations proc_tgid_
static struct inode_operations proc_tgid_attr_inode_operations;
#endif
+static int get_tid_list(int index, unsigned int *tids, struct inode *dir);
+
/* SMP-safe */
static struct dentry *proc_pident_lookup(struct inode *dir,
struct dentry *dentry,
@@ -1515,7 +1517,7 @@ static struct dentry *proc_pident_lookup
*/
switch(p->type) {
case PROC_TGID_TASK:
- inode->i_nlink = 3;
+ inode->i_nlink = 2 + get_tid_list(2, NULL, dir);
inode->i_op = &proc_task_inode_operations;
inode->i_fop = &proc_task_operations;
break;
@@ -2004,7 +2006,8 @@ static int get_tid_list(int index, unsig
if (--index >= 0)
continue;
- tids[nr_tids] = tid;
+ if (tids != NULL)
+ tids[nr_tids] = tid;
nr_tids++;
if (nr_tids >= PROC_MAXPIDS)
break;
@@ -2104,6 +2107,7 @@ static int proc_task_readdir(struct file
}
nr_tids = get_tid_list(pos, tid_array, inode);
+ inode->i_nlink = pos + nr_tids;
for (i = 0; i < nr_tids; i++) {
unsigned long j = PROC_NUMBUF;
_