aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorEd L. Cashin <ecashin@coraid.com>2008-02-08 07:20:08 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:32 -0500
commit1d75981a8094e9f84fae65a6a83b361e3893b971 (patch)
treeb997d7854436781415e6345f00d7dbd8491e4007 /drivers/block
parent7df620d852642d424afc9777fe57880e02c92832 (diff)
aoe: the aoeminor doesn't need a long format
The aoedev aoeminor member doesn't need a long format. Signed-off-by: Ed L. Cashin <ecashin@coraid.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/aoe/aoeblk.c7
-rw-r--r--drivers/block/aoe/aoecmd.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index deea536cc844..25c6760f8b53 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -202,7 +202,7 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)
202 spin_lock_irqsave(&d->lock, flags); 202 spin_lock_irqsave(&d->lock, flags);
203 203
204 if ((d->flags & DEVFL_UP) == 0) { 204 if ((d->flags & DEVFL_UP) == 0) {
205 printk(KERN_INFO "aoe: device %ld.%ld is not up\n", 205 printk(KERN_INFO "aoe: device %ld.%d is not up\n",
206 d->aoemajor, d->aoeminor); 206 d->aoemajor, d->aoeminor);
207 spin_unlock_irqrestore(&d->lock, flags); 207 spin_unlock_irqrestore(&d->lock, flags);
208 mempool_free(buf, d->bufpool); 208 mempool_free(buf, d->bufpool);
@@ -255,14 +255,15 @@ aoeblk_gdalloc(void *vp)
255 255
256 gd = alloc_disk(AOE_PARTITIONS); 256 gd = alloc_disk(AOE_PARTITIONS);
257 if (gd == NULL) { 257 if (gd == NULL) {
258 printk(KERN_ERR "aoe: cannot allocate disk structure for %ld.%ld\n", 258 printk(KERN_ERR
259 "aoe: cannot allocate disk structure for %ld.%d\n",
259 d->aoemajor, d->aoeminor); 260 d->aoemajor, d->aoeminor);
260 goto err; 261 goto err;
261 } 262 }
262 263
263 d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache); 264 d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
264 if (d->bufpool == NULL) { 265 if (d->bufpool == NULL) {
265 printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%ld\n", 266 printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%d\n",
266 d->aoemajor, d->aoeminor); 267 d->aoemajor, d->aoeminor);
267 goto err_disk; 268 goto err_disk;
268 } 269 }
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index e92d885803a3..bcea36c87d04 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -697,7 +697,8 @@ ataid_complete(struct aoedev *d, struct aoetgt *t, unsigned char *id)
697 } 697 }
698 698
699 if (d->ssize != ssize) 699 if (d->ssize != ssize)
700 printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu sectors\n", 700 printk(KERN_INFO
701 "aoe: %012llx e%ld.%d v%04x has %llu sectors\n",
701 mac_addr(t->addr), 702 mac_addr(t->addr),
702 d->aoemajor, d->aoeminor, 703 d->aoemajor, d->aoeminor,
703 d->fw_ver, (long long)ssize); 704 d->fw_ver, (long long)ssize);
@@ -822,7 +823,7 @@ aoecmd_ata_rsp(struct sk_buff *skb)
822 823
823 if (ahin->cmdstat & 0xa9) { /* these bits cleared on success */ 824 if (ahin->cmdstat & 0xa9) { /* these bits cleared on success */
824 printk(KERN_ERR 825 printk(KERN_ERR
825 "aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%ld\n", 826 "aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%d\n",
826 ahout->cmdstat, ahin->cmdstat, 827 ahout->cmdstat, ahin->cmdstat,
827 d->aoemajor, d->aoeminor); 828 d->aoemajor, d->aoeminor);
828 if (buf) 829 if (buf)