1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 0c39782b2660..b82654e883a7 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -109,12 +109,12 @@ static const struct attribute_group attr_group = {
 static int
 aoedisk_add_sysfs(struct aoedev *d)
 {
-        return sysfs_create_group(&d->gd->dev.kobj, &attr_group);
+        return sysfs_create_group(&disk_to_dev(d->gd)->kobj, &attr_group);
 }
 void
 aoedisk_rm_sysfs(struct aoedev *d)
 {
-        sysfs_remove_group(&d->gd->dev.kobj, &attr_group);
+        sysfs_remove_group(&disk_to_dev(d->gd)->kobj, &attr_group);
 }
 
 static int
@@ -158,9 +158,9 @@ aoeblk_release(struct inode *inode, struct file *filp)
 static int
 aoeblk_make_request(struct request_queue *q, struct bio *bio)
 {
+        struct sk_buff_head queue;
         struct aoedev *d;
         struct buf *buf;
-        struct sk_buff *sl;
         ulong flags;
 
         blk_queue_bounce(q, &bio);
@@ -213,11 +213,11 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)
         list_add_tail(&buf->bufs, &d->bufq);
 
         aoecmd_work(d);
-        sl = d->sendq_hd;
-        d->sendq_hd = d->sendq_tl = NULL;
+        __skb_queue_head_init(&queue);
+        skb_queue_splice_init(&d->sendq, &queue);
 
         spin_unlock_irqrestore(&d->lock, flags);
-        aoenet_xmit(sl);
+        aoenet_xmit(&queue);
 
         return 0;
 }
@@ -276,7 +276,7 @@ aoeblk_gdalloc(void *vp)
         gd->first_minor = d->sysminor * AOE_PARTITIONS;
         gd->fops = &aoe_bdops;
         gd->private_data = d;
-        gd->capacity = d->ssize;
+        set_capacity(gd, d->ssize);
         snprintf(gd->disk_name, sizeof gd->disk_name, "etherd/e%ld.%d",
                 d->aoemajor, d->aoeminor);