Merge nuts.ninka.net:/home/davem/src/BK/warning-2.5

into nuts.ninka.net:/home/davem/src/BK/warn-2.5

drivers/ide/ide-proc.c

@@ -548,7 +548,7 @@ int proc_ide_read_capacity
 		len = sprintf(page, "(none)\n");
         else
 		len = sprintf(page,"%llu\n",
-			      (u64) ((ide_driver_t *)drive->driver)->capacity(drive));
+			      (long long) ((ide_driver_t *)drive->driver)->capacity(drive));
 	PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
 }
 

drivers/ide/ide-taskfile.c

@@ -271,7 +271,7 @@ u8 taskfile_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
 				hwif->OUTB(0x80, IDE_CONTROL_REG);
 				high = task_read_24(drive);
 				sectors = ((u64)high << 24) | low;
-				printk(", LBAsect=%lld", sectors);
+				printk(", LBAsect=%lld", (long long) sectors);
 			} else {
 				u8 cur  = hwif->INB(IDE_SELECT_REG);
 				u8 low  = hwif->INB(IDE_LCYL_REG);

drivers/ide/ide.c

@@ -567,7 +567,7 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
 
 					sectors = ((u64)high << 24) | low;
 					printk(", LBAsect=%llu, high=%d, low=%d",
-					       (u64) sectors,
+					       (long long) sectors,
 					       high, low);
 				} else {
 					u8 cur = hwif->INB(IDE_SELECT_REG);

drivers/net/ppp_generic.c

@@ -1401,7 +1401,7 @@ ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
 	if (skb->len > 0)
 		/* note: a 0-length skb is used as an error indication */
 		++ppp->stats.rx_length_errors;
-err:
+
 	kfree_skb(skb);
 	ppp_receive_error(ppp);
 }

drivers/pci/pool.c

@@ -69,7 +69,7 @@ show_pools (struct device *dev, char *buf, size_t count, loff_t off)
 		}
 
 		/* per-pool info, no real statistics yet */
-		temp = snprintf (next, size, "%-16s %4u %4u %4u %2u\n",
+		temp = snprintf (next, size, "%-16s %4u %4Zu %4Zu %2u\n",
 				pool->name,
 				blocks, pages * pool->blocks_per_page,
 				pool->size, pages);

drivers/usb/serial/visor.c

@@ -591,7 +591,7 @@ static int visor_probe (struct usb_serial *serial)
 			info("%s: port %d, is for %s use", serial->type->name,
 			     connection_info->connections[i].port, string);
 		/* save off our num_ports info so that we can use it in the calc_num_ports call */
-		serial->private = (void *)num_ports;
+		serial->private = (void *)(long)num_ports;
 		}
 	}
 
@@ -637,7 +637,7 @@ static int visor_calc_num_ports (struct usb_serial *serial)
 	int num_ports = 0;
 
 	if (serial->private) {
-		num_ports = (int)serial->private;
+		num_ports = (int)(long)serial->private;
 		serial->private = NULL;
 	}
 	return num_ports;

fs/nfs/nfs2xdr.c

@@ -251,7 +251,7 @@ nfs_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res)
 	hdrlen = (u8 *) p - (u8 *) iov->iov_base;
 	if (iov->iov_len < hdrlen) {
 		printk(KERN_WARNING "NFS: READ reply header overflowed:"
-				"length %d > %d\n", hdrlen, iov->iov_len);
+				"length %d > %Zu\n", hdrlen, iov->iov_len);
 		return -errno_NFSERR_IO;
 	} else if (iov->iov_len != hdrlen) {
 		dprintk("NFS: READ header is short. iovec will be shifted.\n");
@@ -404,7 +404,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, u32 *p, void *dummy)
 	hdrlen = (u8 *) p - (u8 *) iov->iov_base;
 	if (iov->iov_len < hdrlen) {
 		printk(KERN_WARNING "NFS: READDIR reply header overflowed:"
-				"length %d > %d\n", hdrlen, iov->iov_len);
+				"length %d > %Zu\n", hdrlen, iov->iov_len);
 		return -errno_NFSERR_IO;
 	} else if (iov->iov_len != hdrlen) {
 		dprintk("NFS: READDIR header is short. iovec will be shifted.\n");

fs/nfs/nfs3xdr.c

@@ -525,7 +525,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, u32 *p, struct nfs3_readdirres *res)
 	hdrlen = (u8 *) p - (u8 *) iov->iov_base;
 	if (iov->iov_len < hdrlen) {
 		printk(KERN_WARNING "NFS: READDIR reply header overflowed:"
-				"length %d > %d\n", hdrlen, iov->iov_len);
+				"length %d > %Zu\n", hdrlen, iov->iov_len);
 		return -errno_NFSERR_IO;
 	} else if (iov->iov_len != hdrlen) {
 		dprintk("NFS: READDIR header is short. iovec will be shifted.\n");
@@ -808,7 +808,7 @@ nfs3_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res)
 	hdrlen = (u8 *) p - (u8 *) iov->iov_base;
 	if (iov->iov_len < hdrlen) {
 		printk(KERN_WARNING "NFS: READ reply header overflowed:"
-				"length %d > %d\n", hdrlen, iov->iov_len);
+				"length %d > %Zu\n", hdrlen, iov->iov_len);
        		return -errno_NFSERR_IO;
 	} else if (iov->iov_len != hdrlen) {
 		dprintk("NFS: READ header is short. iovec will be shifted.\n");

fs/xfs/linux/xfs_aops.c

@@ -609,7 +609,7 @@ linvfs_get_block_core(
 
 	if (blocks) {
 		size = (pbmap.pbm_bsize - pbmap.pbm_delta); 
-		bh_result->b_size = min(size, blocks << inode->i_blkbits);
+		bh_result->b_size = min_t(ssize_t, size, blocks << inode->i_blkbits);
 	}
 
 	return 0;