소스 검색

[PATCH] fix handling of st_nlink on procfs root

1) it should use nr_processes(), not nr_threads; otherwise we are getting
very confused find(1) and friends, among other things.
2) better do that at stat() time than at every damn lookup in procfs root.

Patch had been sitting in FC4 kernels for many months now...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 19 년 전
부모
커밋
76b6159ba0
2개의 변경된 파일9개의 추가작업 그리고 12개의 파일을 삭제
  1. 0 4
      fs/proc/inode.c
  2. 9 8
      fs/proc/root.c

+ 0 - 4
fs/proc/inode.c

@@ -204,10 +204,6 @@ int proc_fill_super(struct super_block *s, void *data, int silent)
 	root_inode = proc_get_inode(s, PROC_ROOT_INO, &proc_root);
 	root_inode = proc_get_inode(s, PROC_ROOT_INO, &proc_root);
 	if (!root_inode)
 	if (!root_inode)
 		goto out_no_root;
 		goto out_no_root;
-	/*
-	 * Fixup the root inode's nlink value
-	 */
-	root_inode->i_nlink += nr_processes();
 	root_inode->i_uid = 0;
 	root_inode->i_uid = 0;
 	root_inode->i_gid = 0;
 	root_inode->i_gid = 0;
 	s->s_root = d_alloc_root(root_inode);
 	s->s_root = d_alloc_root(root_inode);

+ 9 - 8
fs/proc/root.c

@@ -80,16 +80,16 @@ void __init proc_root_init(void)
 	proc_bus = proc_mkdir("bus", NULL);
 	proc_bus = proc_mkdir("bus", NULL);
 }
 }
 
 
-static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd)
+static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
+)
 {
 {
-	/*
-	 * nr_threads is actually protected by the tasklist_lock;
-	 * however, it's conventional to do reads, especially for
-	 * reporting, without any locking whatsoever.
-	 */
-	if (dir->i_ino == PROC_ROOT_INO) /* check for safety... */
-		dir->i_nlink = proc_root.nlink + nr_threads;
+	generic_fillattr(dentry->d_inode, stat);
+	stat->nlink = proc_root.nlink + nr_processes();
+	return 0;
+}
 
 
+static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd)
+{
 	if (!proc_lookup(dir, dentry, nd)) {
 	if (!proc_lookup(dir, dentry, nd)) {
 		return NULL;
 		return NULL;
 	}
 	}
@@ -134,6 +134,7 @@ static struct file_operations proc_root_operations = {
  */
  */
 static struct inode_operations proc_root_inode_operations = {
 static struct inode_operations proc_root_inode_operations = {
 	.lookup		= proc_root_lookup,
 	.lookup		= proc_root_lookup,
+	.getattr	= proc_root_getattr,
 };
 };
 
 
 /*
 /*