Merge ../powerpc-merge

1 files changed, 9 insertions, 8 deletions

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 68896283c8ae..c3fd3611112f 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -80,16 +80,16 @@ void __init proc_root_init(void)
         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)) {
                 return NULL;
         }
@@ -134,6 +134,7 @@ static struct file_operations proc_root_operations = {
  */
 static struct inode_operations proc_root_inode_operations = {
         .lookup         = proc_root_lookup,
+        .getattr        = proc_root_getattr,
 };
 
 /*