Drop 'size' argument from bio_endio and bi_end_io

[firefly-linux-kernel-4.4.55.git] / drivers / block / aoe / aoeblk.c

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 4259b52b01e2639143a3cc6965221ca6ef9c55b4..b1d00ef6659ce40332e7766152014b9987b69cbf 100644 (file)
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -12,7 +12,7 @@
 #include <linux/netdevice.h>
 #include "aoe.h"
 
-static kmem_cache_t *buf_pool_cache;
+static struct kmem_cache *buf_pool_cache;
 
 static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
 {
@@ -63,21 +63,27 @@ static struct disk_attribute disk_attr_fwver = {
        .show = aoedisk_show_fwver
 };
 
-static void
+static struct attribute *aoe_attrs[] = {
+       &disk_attr_state.attr,
+       &disk_attr_mac.attr,
+       &disk_attr_netif.attr,
+       &disk_attr_fwver.attr,
+       NULL
+};
+
+static const struct attribute_group attr_group = {
+       .attrs = aoe_attrs,
+};
+
+static int
 aoedisk_add_sysfs(struct aoedev *d)
 {
-       sysfs_create_file(&d->gd->kobj, &disk_attr_state.attr);
-       sysfs_create_file(&d->gd->kobj, &disk_attr_mac.attr);
-       sysfs_create_file(&d->gd->kobj, &disk_attr_netif.attr);
-       sysfs_create_file(&d->gd->kobj, &disk_attr_fwver.attr);
+       return sysfs_create_group(&d->gd->kobj, &attr_group);
 }
 void
 aoedisk_rm_sysfs(struct aoedev *d)
 {
-       sysfs_remove_link(&d->gd->kobj, "state");
-       sysfs_remove_link(&d->gd->kobj, "mac");
-       sysfs_remove_link(&d->gd->kobj, "netif");
-       sysfs_remove_link(&d->gd->kobj, "firmware-version");
+       sysfs_remove_group(&d->gd->kobj, &attr_group);
 }
 
 static int
@@ -119,7 +125,7 @@ aoeblk_release(struct inode *inode, struct file *filp)
 }
 
 static int
-aoeblk_make_request(request_queue_t *q, struct bio *bio)
+aoeblk_make_request(struct request_queue *q, struct bio *bio)
 {
        struct aoedev *d;
        struct buf *buf;
@@ -132,7 +138,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
        buf = mempool_alloc(d->bufpool, GFP_NOIO);
        if (buf == NULL) {
                printk(KERN_INFO "aoe: buf allocation failure\n");
-               bio_endio(bio, bio->bi_size, -ENOMEM);
+               bio_endio(bio, -ENOMEM);
                return 0;
        }
        memset(buf, 0, sizeof(*buf));
@@ -153,7 +159,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
                        d->aoemajor, d->aoeminor);
                spin_unlock_irqrestore(&d->lock, flags);
                mempool_free(buf, d->bufpool);
-               bio_endio(bio, bio->bi_size, -ENXIO);
+               bio_endio(bio, -ENXIO);
                return 0;
        }
 
@@ -251,9 +257,9 @@ aoeblk_exit(void)
 int __init
 aoeblk_init(void)
 {
-       buf_pool_cache = kmem_cache_create("aoe_bufs", 
+       buf_pool_cache = kmem_cache_create("aoe_bufs",
                                           sizeof(struct buf),
-                                          0, 0, NULL, NULL);
+                                          0, 0, NULL);
        if (buf_pool_cache == NULL)
                return -ENOMEM;