2 files changed, 12 insertions, 18 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 3217774d269f..9a4da0aae02e 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -314,9 +314,12 @@ static int proc_pid_schedstat(struct task_struct *task, char *buffer)
 static int lstats_show_proc(struct seq_file *m, void *v)
 {
         int i;
-        struct task_struct *task = m->private;
-        seq_puts(m, "Latency Top version : v0.1\n");
+        struct inode *inode = m->private;
+        struct task_struct *task = get_proc_task(inode);
 
+        if (!task)
+                return -ESRCH;
+        seq_puts(m, "Latency Top version : v0.1\n");
         for (i = 0; i < 32; i++) {
                 if (task->latency_record[i].backtrace[0]) {
                         int q;
@@ -341,32 +344,24 @@ static int lstats_show_proc(struct seq_file *m, void *v)
                 }
 
         }
+        put_task_struct(task);
         return 0;
 }
 
 static int lstats_open(struct inode *inode, struct file *file)
 {
-        int ret;
-        struct seq_file *m;
-        struct task_struct *task = get_proc_task(inode);
-
-        ret = single_open(file, lstats_show_proc, NULL);
-        if (!ret) {
-                m = file->private_data;
-                m->private = task;
-        }
-        return ret;
+        return single_open(file, lstats_show_proc, inode);
 }
 
 static ssize_t lstats_write(struct file *file, const char __user *buf,
                             size_t count, loff_t *offs)
 {
-        struct seq_file *m;
-        struct task_struct *task;
+        struct task_struct *task = get_proc_task(file->f_dentry->d_inode);
 
-        m = file->private_data;
-        task = m->private;
+        if (!task)
+                return -ESRCH;
         clear_all_latency_tracing(task);
+        put_task_struct(task);
 
         return count;
 }
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 468805d40e2b..2d563979cb02 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -32,6 +32,7 @@
 #include <linux/interrupt.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
+#include <linux/genhd.h>
 #include <linux/smp.h>
 #include <linux/signal.h>
 #include <linux/module.h>
@@ -377,7 +378,6 @@ static int stram_read_proc(char *page, char **start, off_t off,
 #endif
 
 #ifdef CONFIG_BLOCK
-extern const struct seq_operations partitions_op;
 static int partitions_open(struct inode *inode, struct file *file)
 {
         return seq_open(file, &partitions_op);
@@ -389,7 +389,6 @@ static const struct file_operations proc_partitions_operations = {
         .release        = seq_release,
 };
 
-extern const struct seq_operations diskstats_op;
 static int diskstats_open(struct inode *inode, struct file *file)
 {
         return seq_open(file, &diskstats_op);