diff options
Diffstat (limited to 'drivers/block/aoe')
-rw-r--r-- | drivers/block/aoe/aoeblk.c | 4 | ||||
-rw-r--r-- | drivers/block/aoe/aoecmd.c | 2 | ||||
-rw-r--r-- | drivers/block/aoe/aoedev.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c index 007faaf008e7..b1d00ef6659c 100644 --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c | |||
@@ -138,7 +138,7 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio) | |||
138 | buf = mempool_alloc(d->bufpool, GFP_NOIO); | 138 | buf = mempool_alloc(d->bufpool, GFP_NOIO); |
139 | if (buf == NULL) { | 139 | if (buf == NULL) { |
140 | printk(KERN_INFO "aoe: buf allocation failure\n"); | 140 | printk(KERN_INFO "aoe: buf allocation failure\n"); |
141 | bio_endio(bio, bio->bi_size, -ENOMEM); | 141 | bio_endio(bio, -ENOMEM); |
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | memset(buf, 0, sizeof(*buf)); | 144 | memset(buf, 0, sizeof(*buf)); |
@@ -159,7 +159,7 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio) | |||
159 | d->aoemajor, d->aoeminor); | 159 | d->aoemajor, d->aoeminor); |
160 | spin_unlock_irqrestore(&d->lock, flags); | 160 | spin_unlock_irqrestore(&d->lock, flags); |
161 | mempool_free(buf, d->bufpool); | 161 | mempool_free(buf, d->bufpool); |
162 | bio_endio(bio, bio->bi_size, -ENXIO); | 162 | bio_endio(bio, -ENXIO); |
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c index 01fbdd38e3be..5abae34ad65b 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c | |||
@@ -652,7 +652,7 @@ aoecmd_ata_rsp(struct sk_buff *skb) | |||
652 | disk_stat_add(disk, sectors[rw], n_sect); | 652 | disk_stat_add(disk, sectors[rw], n_sect); |
653 | disk_stat_add(disk, io_ticks, duration); | 653 | disk_stat_add(disk, io_ticks, duration); |
654 | n = (buf->flags & BUFFL_FAIL) ? -EIO : 0; | 654 | n = (buf->flags & BUFFL_FAIL) ? -EIO : 0; |
655 | bio_endio(buf->bio, buf->bio->bi_size, n); | 655 | bio_endio(buf->bio, n); |
656 | mempool_free(buf, d->bufpool); | 656 | mempool_free(buf, d->bufpool); |
657 | } | 657 | } |
658 | } | 658 | } |
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c index 05a97197c918..51f50710e5fc 100644 --- a/drivers/block/aoe/aoedev.c +++ b/drivers/block/aoe/aoedev.c | |||
@@ -119,7 +119,7 @@ aoedev_downdev(struct aoedev *d) | |||
119 | bio = buf->bio; | 119 | bio = buf->bio; |
120 | if (--buf->nframesout == 0) { | 120 | if (--buf->nframesout == 0) { |
121 | mempool_free(buf, d->bufpool); | 121 | mempool_free(buf, d->bufpool); |
122 | bio_endio(bio, bio->bi_size, -EIO); | 122 | bio_endio(bio, -EIO); |
123 | } | 123 | } |
124 | skb_shinfo(f->skb)->nr_frags = f->skb->data_len = 0; | 124 | skb_shinfo(f->skb)->nr_frags = f->skb->data_len = 0; |
125 | } | 125 | } |
@@ -130,7 +130,7 @@ aoedev_downdev(struct aoedev *d) | |||
130 | list_del(d->bufq.next); | 130 | list_del(d->bufq.next); |
131 | bio = buf->bio; | 131 | bio = buf->bio; |
132 | mempool_free(buf, d->bufpool); | 132 | mempool_free(buf, d->bufpool); |
133 | bio_endio(bio, bio->bi_size, -EIO); | 133 | bio_endio(bio, -EIO); |
134 | } | 134 | } |
135 | 135 | ||
136 | if (d->gd) | 136 | if (d->gd) |