On Tue, 26 Jun 2007 14:50:12 -0400 Ed L. Cashin wrote:
> The aoedev aoeminor member doesn't need a long format.
Was there a patch that changed aoeminor to an int?
Last I see is:
ulong aoeminor;
in linux-2.6.22-rc6/drivers/block/aoe/aoe.h.
If it's still ulong, you shouldn't change the printk format.
> Signed-off-by: Ed L. Cashin <[EMAIL PROTECTED]>
> ---
> drivers/block/aoe/aoeblk.c | 6 +++---
> drivers/block/aoe/aoecmd.c | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
> index ccadd9a..e216fe0 100644
> --- a/drivers/block/aoe/aoeblk.c
> +++ b/drivers/block/aoe/aoeblk.c
> @@ -203,7 +203,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
> spin_lock_irqsave(&d->lock, flags);
>
> if ((d->flags & DEVFL_UP) == 0) {
> - printk(KERN_INFO "aoe: device %ld.%ld is not up\n",
> + printk(KERN_INFO "aoe: device %ld.%d is not up\n",
> d->aoemajor, d->aoeminor);
> spin_unlock_irqrestore(&d->lock, flags);
> mempool_free(buf, d->bufpool);
> @@ -256,7 +256,7 @@ aoeblk_gdalloc(void *vp)
>
> gd = alloc_disk(AOE_PARTITIONS);
> if (gd == NULL) {
> - printk(KERN_ERR "aoe: cannot allocate disk structure for
> %ld.%ld\n",
> + printk(KERN_ERR "aoe: cannot allocate disk structure for
> %ld.%d\n",
> d->aoemajor, d->aoeminor);
> spin_lock_irqsave(&d->lock, flags);
> d->flags &= ~DEVFL_GDALLOC;
> @@ -266,7 +266,7 @@ aoeblk_gdalloc(void *vp)
>
> d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
> if (d->bufpool == NULL) {
> - printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%ld\n",
> + printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%d\n",
> d->aoemajor, d->aoeminor);
> put_disk(gd);
> spin_lock_irqsave(&d->lock, flags);
> diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
> index 9de0024..dfb1184 100644
> --- a/drivers/block/aoe/aoecmd.c
> +++ b/drivers/block/aoe/aoecmd.c
> @@ -680,7 +680,7 @@ ataid_complete(struct aoedev *d, struct aoetgt *t,
> unsigned char *id)
> }
>
> if (d->ssize != ssize)
> - printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu
> sectors\n",
> + printk(KERN_INFO "aoe: %012llx e%ld.%d v%04x has %llu
> sectors\n",
> mac_addr(t->addr),
> d->aoemajor, d->aoeminor,
> d->fw_ver, (long long)ssize);
> @@ -805,7 +805,7 @@ aoecmd_ata_rsp(struct sk_buff *skb)
>
> if (ahin->cmdstat & 0xa9) { /* these bits cleared on success */
> printk(KERN_ERR
> - "aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%ld\n",
> + "aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%d\n",
> ahout->cmdstat, ahin->cmdstat,
> d->aoemajor, d->aoeminor);
> if (buf)
> --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
