5 files changed, 42 insertions, 48 deletions

diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index 08fa320b7e6d..15e05a15b575 100644
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -92,23 +92,6 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
         return fid;
 }
 
-struct p9_fid *v9fs_fid_lookup_remove(struct dentry *dentry)
-{
-        struct p9_fid *fid;
-        struct v9fs_dentry *dent;
-
-        dent = dentry->d_fsdata;
-        fid = v9fs_fid_lookup(dentry);
-        if (!IS_ERR(fid)) {
-                spin_lock(&dent->lock);
-                list_del(&fid->dlist);
-                spin_unlock(&dent->lock);
-        }
-
-        return fid;
-}
-
-
 /**
  * v9fs_fid_clone - lookup the fid for a dentry, clone a private copy and
  *      release it
diff --git a/fs/9p/fid.h b/fs/9p/fid.h
index 47a0ba742872..26e07df783b9 100644
--- a/fs/9p/fid.h
+++ b/fs/9p/fid.h
@@ -28,6 +28,5 @@ struct v9fs_dentry {
 };
 
 struct p9_fid *v9fs_fid_lookup(struct dentry *dentry);
-struct p9_fid *v9fs_fid_lookup_remove(struct dentry *dentry);
 struct p9_fid *v9fs_fid_clone(struct dentry *dentry);
 int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid);
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 965625a0977d..ee4814dd98f9 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -320,7 +320,21 @@ int proc_pid_status(struct task_struct *task, char *buffer)
         return buffer - orig;
 }
 
-static clock_t task_utime(struct task_struct *p)
+/*
+ * Use precise platform statistics if available:
+ */
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+static cputime_t task_utime(struct task_struct *p)
+{
+        return p->utime;
+}
+
+static cputime_t task_stime(struct task_struct *p)
+{
+        return p->stime;
+}
+#else
+static cputime_t task_utime(struct task_struct *p)
 {
         clock_t utime = cputime_to_clock_t(p->utime),
                 total = utime + cputime_to_clock_t(p->stime);
@@ -337,10 +351,10 @@ static clock_t task_utime(struct task_struct *p)
         }
         utime = (clock_t)temp;
 
-        return utime;
+        return clock_t_to_cputime(utime);
 }
 
-static clock_t task_stime(struct task_struct *p)
+static cputime_t task_stime(struct task_struct *p)
 {
         clock_t stime;
 
@@ -349,10 +363,12 @@ static clock_t task_stime(struct task_struct *p)
          * the total, to make sure the total observed by userspace
          * grows monotonically - apps rely on that):
          */
-        stime = nsec_to_clock_t(p->se.sum_exec_runtime) - task_utime(p);
+        stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
+                        cputime_to_clock_t(task_utime(p));
 
-        return stime;
+        return clock_t_to_cputime(stime);
 }
+#endif
 
 static int do_task_stat(struct task_struct *task, char *buffer, int whole)
 {
@@ -368,8 +384,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
         unsigned long long start_time;
         unsigned long cmin_flt = 0, cmaj_flt = 0;
         unsigned long  min_flt = 0,  maj_flt = 0;
-        cputime_t cutime, cstime;
-        clock_t utime, stime;
+        cputime_t cutime, cstime, utime, stime;
         unsigned long rsslim = 0;
         char tcomm[sizeof(task->comm)];
         unsigned long flags;
@@ -387,8 +402,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
 
         sigemptyset(&sigign);
         sigemptyset(&sigcatch);
-        cutime = cstime = cputime_zero;
-        utime = stime = 0;
+        cutime = cstime = utime = stime = cputime_zero;
 
         rcu_read_lock();
         if (lock_task_sighand(task, &flags)) {
@@ -414,15 +428,15 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
                         do {
                                 min_flt += t->min_flt;
                                 maj_flt += t->maj_flt;
-                                utime += task_utime(t);
-                                stime += task_stime(t);
+                                utime = cputime_add(utime, task_utime(t));
+                                stime = cputime_add(stime, task_stime(t));
                                 t = next_thread(t);
                         } while (t != task);
 
                         min_flt += sig->min_flt;
                         maj_flt += sig->maj_flt;
-                        utime += cputime_to_clock_t(sig->utime);
-                        stime += cputime_to_clock_t(sig->stime);
+                        utime = cputime_add(utime, sig->utime);
+                        stime = cputime_add(stime, sig->stime);
                 }
 
                 sid = signal_session(sig);
@@ -471,8 +485,8 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
                 cmin_flt,
                 maj_flt,
                 cmaj_flt,
-                utime,
-                stime,
+                cputime_to_clock_t(utime),
+                cputime_to_clock_t(stime),
                 cputime_to_clock_t(cutime),
                 cputime_to_clock_t(cstime),
                 priority,
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index 135353f8a296..5afe2a26f5d8 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -248,12 +248,7 @@ int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr)
 
 void sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr)
 {
-        if (sysfs_hash_and_remove(kobj->sd, attr->attr.name) < 0) {
-                printk(KERN_ERR "%s: "
-                        "bad dentry or inode or no such file: \"%s\"\n",
-                        __FUNCTION__, attr->attr.name);
-                dump_stack();
-        }
+        sysfs_hash_and_remove(kobj->sd, attr->attr.name);
 }
 
 EXPORT_SYMBOL_GPL(sysfs_create_bin_file);
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 048e6054c2fd..83e76b3813c9 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -762,12 +762,15 @@ static int sysfs_count_nlink(struct sysfs_dirent *sd)
 static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
                                 struct nameidata *nd)
 {
+        struct dentry *ret = NULL;
         struct sysfs_dirent * parent_sd = dentry->d_parent->d_fsdata;
         struct sysfs_dirent * sd;
         struct bin_attribute *bin_attr;
         struct inode *inode;
         int found = 0;
 
+        mutex_lock(&sysfs_mutex);
+
         for (sd = parent_sd->s_children; sd; sd = sd->s_sibling) {
                 if (sysfs_type(sd) &&
                     !strcmp(sd->s_name, dentry->d_name.name)) {
@@ -778,14 +781,14 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
 
         /* no such entry */
         if (!found)
-                return NULL;
+                goto out_unlock;
 
         /* attach dentry and inode */
         inode = sysfs_get_inode(sd);
-        if (!inode)
-                return ERR_PTR(-ENOMEM);
-
-        mutex_lock(&sysfs_mutex);
+        if (!inode) {
+                ret = ERR_PTR(-ENOMEM);
+                goto out_unlock;
+        }
 
         if (inode->i_state & I_NEW) {
                 /* initialize inode according to type */
@@ -815,9 +818,9 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
         sysfs_instantiate(dentry, inode);
         sysfs_attach_dentry(sd, dentry);
 
+ out_unlock:
         mutex_unlock(&sysfs_mutex);
-
-        return NULL;
+        return ret;
 }
 
 const struct inode_operations sysfs_dir_inode_operations = {
@@ -942,6 +945,8 @@ int sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
         if (error)
                 goto out_drop;
 
+        mutex_lock(&sysfs_mutex);
+
         dup_name = sd->s_name;
         sd->s_name = new_name;
 
@@ -949,8 +954,6 @@ int sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
         d_add(new_dentry, NULL);
         d_move(sd->s_dentry, new_dentry);
 
-        mutex_lock(&sysfs_mutex);
-
         sysfs_unlink_sibling(sd);
         sysfs_get(new_parent_sd);
         sysfs_put(sd->s_parent);