aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/aoe/aoeblk.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/aoe/aoeblk.c')
-rw-r--r--drivers/block/aoe/aoeblk.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 088acf48ffa4..4259b52b01e2 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -131,7 +131,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
131 d = bio->bi_bdev->bd_disk->private_data; 131 d = bio->bi_bdev->bd_disk->private_data;
132 buf = mempool_alloc(d->bufpool, GFP_NOIO); 132 buf = mempool_alloc(d->bufpool, GFP_NOIO);
133 if (buf == NULL) { 133 if (buf == NULL) {
134 iprintk("buf allocation failure\n"); 134 printk(KERN_INFO "aoe: buf allocation failure\n");
135 bio_endio(bio, bio->bi_size, -ENOMEM); 135 bio_endio(bio, bio->bi_size, -ENOMEM);
136 return 0; 136 return 0;
137 } 137 }
@@ -149,7 +149,8 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
149 spin_lock_irqsave(&d->lock, flags); 149 spin_lock_irqsave(&d->lock, flags);
150 150
151 if ((d->flags & DEVFL_UP) == 0) { 151 if ((d->flags & DEVFL_UP) == 0) {
152 iprintk("device %ld.%ld is not up\n", d->aoemajor, d->aoeminor); 152 printk(KERN_INFO "aoe: device %ld.%ld is not up\n",
153 d->aoemajor, d->aoeminor);
153 spin_unlock_irqrestore(&d->lock, flags); 154 spin_unlock_irqrestore(&d->lock, flags);
154 mempool_free(buf, d->bufpool); 155 mempool_free(buf, d->bufpool);
155 bio_endio(bio, bio->bi_size, -ENXIO); 156 bio_endio(bio, bio->bi_size, -ENXIO);
@@ -174,7 +175,7 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
174 struct aoedev *d = bdev->bd_disk->private_data; 175 struct aoedev *d = bdev->bd_disk->private_data;
175 176
176 if ((d->flags & DEVFL_UP) == 0) { 177 if ((d->flags & DEVFL_UP) == 0) {
177 eprintk("disk not up\n"); 178 printk(KERN_ERR "aoe: disk not up\n");
178 return -ENODEV; 179 return -ENODEV;
179 } 180 }
180 181
@@ -201,7 +202,7 @@ aoeblk_gdalloc(void *vp)
201 202
202 gd = alloc_disk(AOE_PARTITIONS); 203 gd = alloc_disk(AOE_PARTITIONS);
203 if (gd == NULL) { 204 if (gd == NULL) {
204 eprintk("cannot allocate disk structure for %ld.%ld\n", 205 printk(KERN_ERR "aoe: cannot allocate disk structure for %ld.%ld\n",
205 d->aoemajor, d->aoeminor); 206 d->aoemajor, d->aoeminor);
206 spin_lock_irqsave(&d->lock, flags); 207 spin_lock_irqsave(&d->lock, flags);
207 d->flags &= ~DEVFL_GDALLOC; 208 d->flags &= ~DEVFL_GDALLOC;
@@ -211,7 +212,7 @@ aoeblk_gdalloc(void *vp)
211 212
212 d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache); 213 d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
213 if (d->bufpool == NULL) { 214 if (d->bufpool == NULL) {
214 eprintk("cannot allocate bufpool for %ld.%ld\n", 215 printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%ld\n",
215 d->aoemajor, d->aoeminor); 216 d->aoemajor, d->aoeminor);
216 put_disk(gd); 217 put_disk(gd);
217 spin_lock_irqsave(&d->lock, flags); 218 spin_lock_irqsave(&d->lock, flags);