drivers: Push down BKL into various drivers

[safe/jmp/linux-2.6] / drivers / usb / mon / mon_stat.c

diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c
index 6e4b165..8ec94f1 100644 (file)
--- a/drivers/usb/mon/mon_stat.c
+++ b/drivers/usb/mon/mon_stat.c
@@ -8,7 +8,10 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
+#include <linux/fs.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 #include "usb_mon.h"
@@ -28,11 +31,11 @@ static int mon_stat_open(struct inode *inode, struct file *file)
        if ((sp = kmalloc(sizeof(struct snap), GFP_KERNEL)) == NULL)
                return -ENOMEM;
 
-       mbus = inode->u.generic_ip;
+       mbus = inode->i_private;
 
        sp->slen = snprintf(sp->str, STAT_BUF_SIZE,
-           "nreaders %d text_lost %u\n",
-           mbus->nreaders, mbus->cnt_text_lost);
+           "nreaders %d events %u text_lost %u\n",
+           mbus->nreaders, mbus->cnt_events, mbus->cnt_text_lost);
 
        file->private_data = sp;
        return 0;
@@ -42,33 +45,25 @@ static ssize_t mon_stat_read(struct file *file, char __user *buf,
                                size_t nbytes, loff_t *ppos)
 {
        struct snap *sp = file->private_data;
-       loff_t pos = *ppos;
-       int cnt;
 
-       if (pos < 0 || pos >= sp->slen)
-               return 0;
-       if (nbytes == 0)
-               return 0;
-       if ((cnt = sp->slen - pos) > nbytes)
-               cnt = nbytes;
-       if (copy_to_user(buf, sp->str + pos, cnt))
-               return -EFAULT;
-       *ppos = pos + cnt;
-       return cnt;
+       return simple_read_from_buffer(buf, nbytes, ppos, sp->str, sp->slen);
 }
 
 static int mon_stat_release(struct inode *inode, struct file *file)
 {
+       struct snap *sp = file->private_data;
+       file->private_data = NULL;
+       kfree(sp);
        return 0;
 }
 
-struct file_operations mon_fops_stat = {
+const struct file_operations mon_fops_stat = {
        .owner =        THIS_MODULE,
        .open =         mon_stat_open,
        .llseek =       no_llseek,
        .read =         mon_stat_read,
        /* .write =     mon_stat_write, */
        /* .poll =              mon_stat_poll, */
-       /* .ioctl =     mon_stat_ioctl, */
+       /* .unlocked_ioctl =    mon_stat_ioctl, */
        .release =      mon_stat_release,
 };