[PATCH 10/23] proc: Fix the link count for /proc/<pid>/task

Use getattr to get an accurate link count when needed.  This is cheaper
and more accurate than trying to derive it by walking the thread list
of a process.

Signed-off-by: Eric W. Biederman <[email protected]>


---

 fs/proc/base.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

eec5c7327c53b862025a595985a72fa01509c5e4
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 81c2f2a..1a39258 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1466,6 +1466,7 @@ out:
 
 static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldir);
 static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd);
+static int proc_task_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
 
 static struct file_operations proc_fd_operations = {
 	.read		= generic_read_dir,
@@ -1486,6 +1487,7 @@ static struct inode_operations proc_fd_i
 
 static struct inode_operations proc_task_inode_operations = {
 	.lookup		= proc_task_lookup,
+	.getattr	= proc_task_getattr,
 };
 
 #ifdef CONFIG_SECURITY
@@ -1592,7 +1594,7 @@ static struct dentry *proc_pident_lookup
 	 */
 	switch(p->type) {
 		case PROC_TGID_TASK:
-			inode->i_nlink = 2 + get_tid_list(2, NULL, dir);
+			inode->i_nlink = 2;
 			inode->i_op = &proc_task_inode_operations;
 			inode->i_fop = &proc_task_operations;
 			break;
@@ -2189,7 +2191,6 @@ 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;
@@ -2209,3 +2210,19 @@ out:
 	filp->f_pos = pos;
 	return retval;
 }
+
+static int proc_task_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+{
+	struct inode *inode = dentry->d_inode;
+	struct task_struct *p = proc_task(inode);
+	generic_fillattr(inode, stat);
+
+	if (pid_alive(p)) {
+		task_lock(p);
+		if (p->signal)
+			stat->nlink += atomic_read(&p->signal->count);
+		task_unlock(p);
+	}
+		
+	return 0;
+}
-- 
1.2.2.g709a

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 11/23] proc: Move proc_maps_operations into task_mmu.c
    • From: [email protected] (Eric W. Biederman)

• References:
  • [PATCH 00/23] proc cleanup.
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 01/23] tref: Implement task references.
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 02/23] proc: Fix the .. inode number on /proc/<pid>/fd
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 03/23] proc: Remove useless BKL in proc_pid_readlink.
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 04/23] proc: Remove unnecessary and misleading assignments from proc_pid_make_inode.
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 05/23] proc: Simplify the ownership rules for /proc
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 06/23] proc: Replace proc_inode.type with proc_inode.fd
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 07/23] proc: Remove bogus proc_task_permission.
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 08/23] proc: Kill proc_mem_inode_operations.
    • From: [email protected] (Eric W. Biederman)
  • [PATCH 09/23] proc: Properly filter out files that are not visible to a process.
    • From: [email protected] (Eric W. Biederman)

• Prev by Date: [PATCH 09/23] proc: Properly filter out files that are not visible to a process.
• Next by Date: Re: what's a platform device?
• Previous by thread: [PATCH 09/23] proc: Properly filter out files that are not visible to a process.
• Next by thread: [PATCH 11/23] proc: Move proc_maps_operations into task_mmu.c
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]