dma/ia64: update ia64 machvecs, swiotlb.c

[safe/jmp/linux-2.6] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index b413318..23ea4fd 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -37,7 +37,6 @@ struct bsg_device {
        struct list_head done_list;
        struct hlist_node dev_list;
        atomic_t ref_count;
-       int minor;
        int queued_cmds;
        int done_cmds;
        wait_queue_head_t wq_done;
@@ -468,8 +467,6 @@ static int bsg_complete_all_commands(struct bsg_device *bd)
 
        dprintk("%s: entered\n", bd->name);
 
-       set_bit(BSG_F_BLOCK, &bd->flags);
-
        /*
         * wait for all commands to complete
         */
@@ -702,14 +699,26 @@ static struct bsg_device *bsg_alloc_device(void)
        return bd;
 }
 
+static void bsg_kref_release_function(struct kref *kref)
+{
+       struct bsg_class_device *bcd =
+               container_of(kref, struct bsg_class_device, ref);
+
+       if (bcd->release)
+               bcd->release(bcd->parent);
+
+       put_device(bcd->parent);
+}
+
 static int bsg_put_device(struct bsg_device *bd)
 {
-       int ret = 0;
-       struct device *dev = bd->queue->bsg_dev.dev;
+       int ret = 0, do_free;
+       struct request_queue *q = bd->queue;
 
        mutex_lock(&bsg_mutex);
 
-       if (!atomic_dec_and_test(&bd->ref_count))
+       do_free = atomic_dec_and_test(&bd->ref_count);
+       if (!do_free)
                goto out;
 
        dprintk("%s: tearing down\n", bd->name);
@@ -726,12 +735,13 @@ static int bsg_put_device(struct bsg_device *bd)
         */
        ret = bsg_complete_all_commands(bd);
 
-       blk_put_queue(bd->queue);
        hlist_del(&bd->dev_list);
        kfree(bd);
 out:
        mutex_unlock(&bsg_mutex);
-       put_device(dev);
+       kref_put(&q->bsg_dev.ref, bsg_kref_release_function);
+       if (do_free)
+               blk_put_queue(q);
        return ret;
 }
 
@@ -758,11 +768,10 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
        bsg_set_block(bd, file);
 
        atomic_set(&bd->ref_count, 1);
-       bd->minor = iminor(inode);
        mutex_lock(&bsg_mutex);
-       hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(bd->minor));
+       hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
 
-       strncpy(bd->name, rq->bsg_dev.class_dev->class_id, sizeof(bd->name) - 1);
+       strncpy(bd->name, rq->bsg_dev.class_dev->bus_id, sizeof(bd->name) - 1);
        dprintk("bound to <%s>, max queue %d\n",
                format_dev_t(buf, inode->i_rdev), bd->max_queue);
 
@@ -770,7 +779,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
        return bd;
 }
 
-static struct bsg_device *__bsg_get_device(int minor)
+static struct bsg_device *__bsg_get_device(int minor, struct request_queue *q)
 {
        struct bsg_device *bd;
        struct hlist_node *entry;
@@ -778,7 +787,7 @@ static struct bsg_device *__bsg_get_device(int minor)
        mutex_lock(&bsg_mutex);
 
        hlist_for_each_entry(bd, entry, bsg_dev_idx_hash(minor), dev_list) {
-               if (bd->minor == minor) {
+               if (bd->queue == q) {
                        atomic_inc(&bd->ref_count);
                        goto found;
                }
@@ -800,19 +809,19 @@ static struct bsg_device *bsg_get_device(struct inode *inode, struct file *file)
        mutex_lock(&bsg_mutex);
        bcd = idr_find(&bsg_minor_idr, iminor(inode));
        if (bcd)
-               get_device(bcd->dev);
+               kref_get(&bcd->ref);
        mutex_unlock(&bsg_mutex);
 
        if (!bcd)
                return ERR_PTR(-ENODEV);
 
-       bd = __bsg_get_device(iminor(inode));
+       bd = __bsg_get_device(iminor(inode), bcd->queue);
        if (bd)
                return bd;
 
        bd = bsg_add_device(inode, bcd->queue, file);
        if (IS_ERR(bd))
-               put_device(bcd->dev);
+               kref_put(&bcd->ref, bsg_kref_release_function);
 
        return bd;
 }
@@ -950,26 +959,26 @@ void bsg_unregister_queue(struct request_queue *q)
        mutex_lock(&bsg_mutex);
        idr_remove(&bsg_minor_idr, bcd->minor);
        sysfs_remove_link(&q->kobj, "bsg");
-       class_device_unregister(bcd->class_dev);
-       put_device(bcd->dev);
+       device_unregister(bcd->class_dev);
        bcd->class_dev = NULL;
+       kref_put(&bcd->ref, bsg_kref_release_function);
        mutex_unlock(&bsg_mutex);
 }
 EXPORT_SYMBOL_GPL(bsg_unregister_queue);
 
-int bsg_register_queue(struct request_queue *q, struct device *gdev,
-                      const char *name)
+int bsg_register_queue(struct request_queue *q, struct device *parent,
+                      const char *name, void (*release)(struct device *))
 {
        struct bsg_class_device *bcd;
        dev_t dev;
        int ret, minor;
-       struct class_device *class_dev = NULL;
+       struct device *class_dev = NULL;
        const char *devname;
 
        if (name)
                devname = name;
        else
-               devname = gdev->bus_id;
+               devname = parent->bus_id;
 
        /*
         * we need a proper transport to send commands, not a stacked device
@@ -1000,10 +1009,11 @@ int bsg_register_queue(struct request_queue *q, struct device *gdev,
 
        bcd->minor = minor;
        bcd->queue = q;
-       bcd->dev = get_device(gdev);
+       bcd->parent = get_device(parent);
+       bcd->release = release;
+       kref_init(&bcd->ref);
        dev = MKDEV(bsg_major, bcd->minor);
-       class_dev = class_device_create(bsg_class, NULL, dev, gdev, "%s",
-                                       devname);
+       class_dev = device_create(bsg_class, parent, dev, "%s", devname);
        if (IS_ERR(class_dev)) {
                ret = PTR_ERR(class_dev);
                goto put_dev;
@@ -1020,9 +1030,9 @@ int bsg_register_queue(struct request_queue *q, struct device *gdev,
        return 0;
 
 unregister_class_dev:
-       class_device_unregister(class_dev);
+       device_unregister(class_dev);
 put_dev:
-       put_device(gdev);
+       put_device(parent);
 remove_idr:
        idr_remove(&bsg_minor_idr, minor);
 unlock: