PATCH: fix some 32bit isms

PATCH: fix some 32bit isms

[Alan Cox]

Fairly self explanatory. int is not size_t.
 
Alan 

OSDL Developer Certificate of Origin 1.0 included herein by reference


diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.8-rc2/drivers/message/fusion/mptbase.c linux-2.6.8-rc2/drivers/message/fusion/mptbase.c
--- linux.vanilla-2.6.8-rc2/drivers/message/fusion/mptbase.c	2004-07-27 19:22:42.000000000 +0100
+++ linux-2.6.8-rc2/drivers/message/fusion/mptbase.c	2004-07-28 14:27:53.603586584 +0100
@@ -2417,7 +2417,7 @@
 	} else {
 		printk(MYIOC_s_ERR_FMT 
 		     "Invalid IOC facts reply, msgLength=%d offsetof=%d!\n",
-		     ioc->name, facts->MsgLength, (offsetof(IOCFactsReply_t,
+		     ioc->name, facts->MsgLength, (int)(offsetof(IOCFactsReply_t,
 		     RequestFrameSize)/sizeof(u32)));
 		return -66;
 	}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.8-rc2/drivers/mtd/inftlmount.c linux-2.6.8-rc2/drivers/mtd/inftlmount.c
--- linux.vanilla-2.6.8-rc2/drivers/mtd/inftlmount.c	2004-07-27 19:22:43.000000000 +0100
+++ linux-2.6.8-rc2/drivers/mtd/inftlmount.c	2004-07-28 14:31:37.711517000 +0100
@@ -58,7 +58,7 @@
 	u8 buf[SECTORSIZE];
 	struct INFTLMediaHeader *mh = &inftl->MediaHdr;
 	struct INFTLPartition *ip;
-	int retlen;
+	size_t retlen;
 
 	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=0x%x)\n",
 		(int)inftl);
@@ -288,7 +288,7 @@
 		inftl->PUtable = kmalloc(inftl->nb_blocks * sizeof(u16), GFP_KERNEL);
 		if (!inftl->PUtable) {
 			printk(KERN_WARNING "INFTL: allocation of PUtable "
-				"failed (%d bytes)\n",
+				"failed (%ld bytes)\n",
 				inftl->nb_blocks * sizeof(u16));
 			return -ENOMEM;
 		}
@@ -297,7 +297,7 @@
 		if (!inftl->VUtable) {
 			kfree(inftl->PUtable);
 			printk(KERN_WARNING "INFTL: allocation of VUtable "
-				"failed (%d bytes)\n",
+				"failed (%ld bytes)\n",
 				inftl->nb_blocks * sizeof(u16));
 			return -ENOMEM;
 		}
@@ -348,7 +348,8 @@
 static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,
 	int len, int check_oob)
 {
-	int i, retlen;
+	int i;
+	size_t retlen;
 	u8 buf[SECTORSIZE + inftl->mbd.mtd->oobsize];
 
 	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: check_free_sectors(inftl=0x%x,"
@@ -382,7 +383,7 @@
  */
 int INFTL_formatblock(struct INFTLrecord *inftl, int block)
 {
-	int retlen;
+	size_t retlen;
 	struct inftl_unittail uci;
 	struct erase_info *instr = &inftl->instr;
 	int physblock;
@@ -551,7 +552,8 @@
 	int chain_length, do_format_chain;
 	struct inftl_unithead1 h0;
 	struct inftl_unittail h1;
-	int i, retlen;
+	int i;
+	size_t retlen;
 	u8 *ANACtable, ANAC;
 
 	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_mount(inftl=0x%x)\n", (int)s);

Re: PATCH: fix some 32bit isms

[H. Peter Anvin]

Followup to:  <20040728135941.GA17409@devserv.devel.redhat.com>
By author:    Alan Cox <alan@redhat.com>
In newsgroup: linux.dev.kernel
>
> Fairly self explanatory. int is not size_t.
>  
> Alan 
> 
> OSDL Developer Certificate of Origin 1.0 included herein by reference
> 
> 
> diff -u --new-file --recursive --exclude-from /usr/src/exclude
> linux.vanilla-2.6.8-rc2/drivers/message/fusion/mptbase.c linux-2.6.8-rc2/drivers/message/fusion/mptbase.c
> --- linux.vanilla-2.6.8-rc2/drivers/message/fusion/mptbase.c	2004-07-27 19:22:42.000000000 +0100
> +++ linux-2.6.8-rc2/drivers/message/fusion/mptbase.c	2004-07-28 14:27:53.603586584 +0100
> @@ -2417,7 +2417,7 @@
>  	} else {
>  		printk(MYIOC_s_ERR_FMT 
>  		     "Invalid IOC facts reply, msgLength=%d offsetof=%d!\n",
> -		     ioc->name, facts->MsgLength, (offsetof(IOCFactsReply_t,
> +		     ioc->name, facts->MsgLength, (int)(offsetof(IOCFactsReply_t,
>  		     RequestFrameSize)/sizeof(u32)));
>  		return -66;
>  	}


This is probably better fixed by changing %d to %zu.

	-hpa

Re: PATCH: fix some 32bit isms

[David S. Miller]

On Wed, 28 Jul 2004 09:59:41 -0400
Alan Cox <alan@redhat.com> wrote:

> Fairly self explanatory. int is not size_t.

And size_t is not "%ld" either.

> -				"failed (%d bytes)\n",
> +				"failed (%ld bytes)\n",

Rather, it is either "%Zd" or "%zd".  Please fix :-)

Re: PATCH: fix some 32bit isms

[Andrew Morton]

Alan Cox <alan@redhat.com> wrote:
>
>  		printk(MYIOC_s_ERR_FMT 
>   		     "Invalid IOC facts reply, msgLength=%d offsetof=%d!\n",
>  -		     ioc->name, facts->MsgLength, (offsetof(IOCFactsReply_t,
>  +		     ioc->name, facts->MsgLength, (int)(offsetof(IOCFactsReply_t,

printk expects %zd for a size_t

>   		     RequestFrameSize)/sizeof(u32)));
> ...
>   			printk(KERN_WARNING "INFTL: allocation of PUtable "
>  -				"failed (%d bytes)\n",
>  +				"failed (%ld bytes)\n",
>   				inftl->nb_blocks * sizeof(u16));

Some architectures will emit a warning here, and will perhaps print the
wrong thing.  We need to print size_t's with %zd.  I'll fix that up.

Re: PATCH: fix some 32bit isms

[Alan Cox]

On Wed, Jul 28, 2004 at 09:23:34AM -0700, Andrew Morton wrote:
> Alan Cox <alan@redhat.com> wrote:
> >
> >  		printk(MYIOC_s_ERR_FMT 
> >   		     "Invalid IOC facts reply, msgLength=%d offsetof=%d!\n",
> >  -		     ioc->name, facts->MsgLength, (offsetof(IOCFactsReply_t,
> >  +		     ioc->name, facts->MsgLength, (int)(offsetof(IOCFactsReply_t,
> 
> printk expects %zd for a size_t

So I've now learned. I've been a bit out of touch with the 2.5/2.6 printk
evolution

> Some architectures will emit a warning here, and will perhaps print the
> wrong thing.  We need to print size_t's with %zd.  I'll fix that up.

Thanks

Re: PATCH: fix some 32bit isms

[H. Peter Anvin]

Followup to:  <20040728092334.74e0cfcd.akpm@osdl.org>
By author:    Andrew Morton <akpm@osdl.org>
In newsgroup: linux.dev.kernel
>
> Alan Cox <alan@redhat.com> wrote:
> >
> >  		printk(MYIOC_s_ERR_FMT 
> >   		     "Invalid IOC facts reply, msgLength=%d offsetof=%d!\n",
> >  -		     ioc->name, facts->MsgLength, (offsetof(IOCFactsReply_t,
> >  +		     ioc->name, facts->MsgLength, (int)(offsetof(IOCFactsReply_t,
> 
> printk expects %zd for a size_t
> 

It should be %zu, since size_t is unsigned.

%zd is appropriate for ssize_t.

	-hpa

Re: PATCH: fix some 32bit isms

[viro]

On Fri, Aug 06, 2004 at 10:53:50PM +0000, H. Peter Anvin wrote:
> Followup to:  <20040728092334.74e0cfcd.akpm@osdl.org>
> By author:    Andrew Morton <akpm@osdl.org>
> In newsgroup: linux.dev.kernel
> >
> > Alan Cox <alan@redhat.com> wrote:
> > >
> > >  		printk(MYIOC_s_ERR_FMT 
> > >   		     "Invalid IOC facts reply, msgLength=%d offsetof=%d!\n",
> > >  -		     ioc->name, facts->MsgLength, (offsetof(IOCFactsReply_t,
> > >  +		     ioc->name, facts->MsgLength, (int)(offsetof(IOCFactsReply_t,
> > 
> > printk expects %zd for a size_t
> > 
> 
> It should be %zu, since size_t is unsigned.
> 
> %zd is appropriate for ssize_t.

It's signed (and not a ssize_t, while we are at it).  If you want to be
pedantic, use %td since we are dealing with ptrdiff_t here.

BTW, we ought to add 't' modifier in vsnpritf()...

Re: PATCH: fix some 32bit isms

[viro]

On Sat, Aug 07, 2004 at 12:03:05AM +0100, viro@parcelfarce.linux.theplanet.co.uk wrote:
> > It should be %zu, since size_t is unsigned.
> > 
> > %zd is appropriate for ssize_t.
> 
> It's signed (and not a ssize_t, while we are at it).  If you want to be
> pedantic, use %td since we are dealing with ptrdiff_t here.

*Ugh*

We are not doing homegrown offsetof(), so it's really size_t.  My apologies.

Yes, that should be> %zu (OTOH, %zd will do the same unless we have 2Gb
struct somewhere ;-)
 
> BTW, we ought to add 't' modifier in vsnpritf()...