lockd: release reference to nsm_handle in nlm_host_rebooted

[safe/jmp/linux-2.6] / drivers / bluetooth / hci_vhci.c

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 0638730..7595274 100644 (file)
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -39,14 +39,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
-#ifndef CONFIG_BT_HCIVHCI_DEBUG
-#undef  BT_DBG
-#define BT_DBG(D...)
-#endif
-
-#define VERSION "1.2"
-
-static int minor = MISC_DYNAMIC_MINOR;
+#define VERSION "1.3"
 
 struct vhci_data {
        struct hci_dev *hdev;
@@ -55,14 +48,8 @@ struct vhci_data {
 
        wait_queue_head_t read_wait;
        struct sk_buff_head readq;
-
-       struct fasync_struct *fasync;
 };
 
-#define VHCI_FASYNC    0x0010
-
-static struct miscdevice vhci_miscdev;
-
 static int vhci_open_dev(struct hci_dev *hdev)
 {
        set_bit(HCI_RUNNING, &hdev->flags);
@@ -109,9 +96,6 @@ static int vhci_send_frame(struct sk_buff *skb)
        memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
        skb_queue_tail(&data->readq, skb);
 
-       if (data->flags & VHCI_FASYNC)
-               kill_fasync(&data->fasync, SIGIO, POLL_IN);
-
        wake_up_interruptible(&data->read_wait);
 
        return 0;
@@ -183,41 +167,31 @@ static inline ssize_t vhci_put_user(struct vhci_data *data,
 static ssize_t vhci_read(struct file *file,
                                char __user *buf, size_t count, loff_t *pos)
 {
-       DECLARE_WAITQUEUE(wait, current);
        struct vhci_data *data = file->private_data;
        struct sk_buff *skb;
        ssize_t ret = 0;
 
-       add_wait_queue(&data->read_wait, &wait);
        while (count) {
-               set_current_state(TASK_INTERRUPTIBLE);
-
                skb = skb_dequeue(&data->readq);
-               if (!skb) {
-                       if (file->f_flags & O_NONBLOCK) {
-                               ret = -EAGAIN;
-                               break;
-                       }
-
-                       if (signal_pending(current)) {
-                               ret = -ERESTARTSYS;
-                               break;
-                       }
-
-                       schedule();
-                       continue;
+               if (skb) {
+                       ret = vhci_put_user(data, skb, buf, count);
+                       if (ret < 0)
+                               skb_queue_head(&data->readq, skb);
+                       else
+                               kfree_skb(skb);
+                       break;
                }
 
-               if (access_ok(VERIFY_WRITE, buf, count))
-                       ret = vhci_put_user(data, skb, buf, count);
-               else
-                       ret = -EFAULT;
+               if (file->f_flags & O_NONBLOCK) {
+                       ret = -EAGAIN;
+                       break;
+               }
 
-               kfree_skb(skb);
-               break;
+               ret = wait_event_interruptible(data->read_wait,
+                                       !skb_queue_empty(&data->readq));
+               if (ret < 0)
+                       break;
        }
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&data->read_wait, &wait);
 
        return ret;
 }
@@ -227,9 +201,6 @@ static ssize_t vhci_write(struct file *file,
 {
        struct vhci_data *data = file->private_data;
 
-       if (!access_ok(VERIFY_READ, buf, count))
-               return -EFAULT;
-
        return vhci_get_user(data, buf, count);
 }
 
@@ -245,12 +216,6 @@ static unsigned int vhci_poll(struct file *file, poll_table *wait)
        return POLLOUT | POLLWRNORM;
 }
 
-static int vhci_ioctl(struct inode *inode, struct file *file,
-                                       unsigned int cmd, unsigned long arg)
-{
-       return -EINVAL;
-}
-
 static int vhci_open(struct inode *inode, struct file *file)
 {
        struct vhci_data *data;
@@ -310,66 +275,37 @@ static int vhci_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int vhci_fasync(int fd, struct file *file, int on)
-{
-       struct vhci_data *data = file->private_data;
-       int err;
-
-       err = fasync_helper(fd, file, on, &data->fasync);
-       if (err < 0)
-               return err;
-
-       if (on)
-               data->flags |= VHCI_FASYNC;
-       else
-               data->flags &= ~VHCI_FASYNC;
-
-       return 0;
-}
-
 static const struct file_operations vhci_fops = {
        .owner          = THIS_MODULE,
        .read           = vhci_read,
        .write          = vhci_write,
        .poll           = vhci_poll,
-       .ioctl          = vhci_ioctl,
        .open           = vhci_open,
        .release        = vhci_release,
-       .fasync         = vhci_fasync,
 };
 
 static struct miscdevice vhci_miscdev= {
-       .name           = "vhci",
-       .fops           = &vhci_fops,
+       .name   = "vhci",
+       .fops   = &vhci_fops,
+       .minor  = MISC_DYNAMIC_MINOR,
 };
 
 static int __init vhci_init(void)
 {
        BT_INFO("Virtual HCI driver ver %s", VERSION);
 
-       vhci_miscdev.minor = minor;
-
-       if (misc_register(&vhci_miscdev) < 0) {
-               BT_ERR("Can't register misc device with minor %d", minor);
-               return -EIO;
-       }
-
-       return 0;
+       return misc_register(&vhci_miscdev);
 }
 
 static void __exit vhci_exit(void)
 {
-       if (misc_deregister(&vhci_miscdev) < 0)
-               BT_ERR("Can't unregister misc device with minor %d", minor);
+       misc_deregister(&vhci_miscdev);
 }
 
 module_init(vhci_init);
 module_exit(vhci_exit);
 
-module_param(minor, int, 0444);
-MODULE_PARM_DESC(minor, "Miscellaneous minor device number");
-
-MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>");
+MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");