Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759344AbXFZTuI (ORCPT ); Tue, 26 Jun 2007 15:50:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757289AbXFZTt4 (ORCPT ); Tue, 26 Jun 2007 15:49:56 -0400 Received: from rgminet01.oracle.com ([148.87.113.118]:27392 "EHLO rgminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757453AbXFZTt4 (ORCPT ); Tue, 26 Jun 2007 15:49:56 -0400 Date: Tue, 26 Jun 2007 12:51:07 -0700 From: Randy Dunlap To: "Ed L. Cashin" Cc: linux-kernel@vger.kernel.org, Greg K-H Subject: Re: [PATCH 12/12] the aoeminor doesn't need a long format Message-Id: <20070626125107.ce2b4325.randy.dunlap@oracle.com> In-Reply-To: References: <1d8423c28c48a6d26516cdc707dbcdf015a4e347.1182883861.git.ecashin@coraid.com> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.4.2 (GTK+ 2.8.10; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Whitelist: TRUE X-Whitelist: TRUE X-Brightmail-Tracker: AAAAAQAAAAI= Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3042 Lines: 80 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 > --- > 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/