From: Sascha Wildner Date: Sun, 26 Mar 2006 07:56:54 +0000 (+0000) Subject: struct buf's b_bcount field has been changed from long to int. Adjust X-Git-Tag: v2.0.1~5176 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/591bdbe99cc8105c66ec4d73ff8eeff53c139095 struct buf's b_bcount field has been changed from long to int. Adjust printf() formats accordingly to silence compiler warnings. --- diff --git a/sys/dev/disk/mcd/mcd.c b/sys/dev/disk/mcd/mcd.c index 5ad6272d07..f66ce48b8e 100644 --- a/sys/dev/disk/mcd/mcd.c +++ b/sys/dev/disk/mcd/mcd.c @@ -41,7 +41,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/mcd.c,v 1.115 2000/01/29 16:17:34 peter Exp $ - * $DragonFly: src/sys/dev/disk/mcd/Attic/mcd.c,v 1.16 2006/03/24 18:35:32 dillon Exp $ + * $DragonFly: src/sys/dev/disk/mcd/Attic/mcd.c,v 1.17 2006/03/26 07:56:54 swildner Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -403,7 +403,7 @@ mcdstrategy(dev_t dev, struct bio *bio) /*MCD_TRACE("strategy: buf=0x%lx, unit=%ld, offset=%lld bcount=%ld\n", bp,unit,bio->bio_offset,bp->b_bcount);*/ if (unit >= NMCD || bio->bio_offset < 0) { - printf("mcdstrategy: unit = %d, offset = %lld, bcount = %ld\n", + printf("mcdstrategy: unit = %d, offset = %lld, bcount = %d\n", unit, bio->bio_offset, bp->b_bcount); printf("mcd: mcdstratregy failure"); bp->b_error = EINVAL; diff --git a/sys/dev/disk/scd/scd.c b/sys/dev/disk/scd/scd.c index 9f8472cf8b..b4ccb82d6c 100644 --- a/sys/dev/disk/scd/scd.c +++ b/sys/dev/disk/scd/scd.c @@ -42,7 +42,7 @@ /* $FreeBSD: src/sys/i386/isa/scd.c,v 1.54 2000/01/29 16:00:30 peter Exp $ */ -/* $DragonFly: src/sys/dev/disk/scd/Attic/scd.c,v 1.15 2006/03/24 18:35:32 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/scd/Attic/scd.c,v 1.16 2006/03/26 07:56:54 swildner Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -324,11 +324,11 @@ scdstrategy(dev_t dev, struct bio *bio) cd = scd_data + unit; - XDEBUG(2, ("scd%d: DEBUG: strategy: offset=%lld, bcount=%ld\n", + XDEBUG(2, ("scd%d: DEBUG: strategy: offset=%lld, bcount=%d\n", unit, bio->bio_offset, bp->b_bcount)); if (unit >= NSCD || bio->bio_offset < 0 || (bp->b_bcount % SCDBLKSIZE)) { - printf("scd%d: strategy failure: offset = %lld, bcount = %ld\n", + printf("scd%d: strategy failure: offset = %lld, bcount = %d\n", unit, bio->bio_offset, bp->b_bcount); bp->b_error = EINVAL; bp->b_flags |= B_ERROR; diff --git a/sys/dev/raid/vinum/vinuminterrupt.c b/sys/dev/raid/vinum/vinuminterrupt.c index d5ef5db26c..8690051bf3 100644 --- a/sys/dev/raid/vinum/vinuminterrupt.c +++ b/sys/dev/raid/vinum/vinuminterrupt.c @@ -41,7 +41,7 @@ * * $Id: vinuminterrupt.c,v 1.12 2000/11/24 03:41:42 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinuminterrupt.c,v 1.25.2.3 2001/05/28 05:56:27 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinuminterrupt.c,v 1.7 2006/03/24 18:35:32 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinuminterrupt.c,v 1.8 2006/03/26 07:56:54 swildner Exp $ */ #include "vinumhdr.h" @@ -409,7 +409,7 @@ complete_raid5_write(struct rqelement *rqe) #if VINUMDEBUG if (debug & DEBUG_ADDRESSES) log(LOG_DEBUG, - " %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %ld\n", + " %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %d\n", rqe->b.b_flags & B_READ ? "Read" : "Write", major(dev), minor(dev), @@ -449,7 +449,7 @@ complete_raid5_write(struct rqelement *rqe) #if VINUMDEBUG if (debug & DEBUG_ADDRESSES) log(LOG_DEBUG, - " %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %ld\n", + " %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %d\n", rqe->b.b_flags & B_READ ? "Read" : "Write", major(dev), minor(dev), diff --git a/sys/dev/raid/vinum/vinumrequest.c b/sys/dev/raid/vinum/vinumrequest.c index 47f700093b..29267de9ec 100644 --- a/sys/dev/raid/vinum/vinumrequest.c +++ b/sys/dev/raid/vinum/vinumrequest.c @@ -39,7 +39,7 @@ * * $Id: vinumrequest.c,v 1.30 2001/01/09 04:20:55 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.44.2.5 2002/08/28 04:30:56 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumrequest.c,v 1.8 2006/03/24 18:35:32 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumrequest.c,v 1.9 2006/03/26 07:56:54 swildner Exp $ */ #include "vinumhdr.h" @@ -343,7 +343,7 @@ launch_requests(struct request *rq, int reviveok) #if VINUMDEBUG if (debug & DEBUG_REVIVECONFLICT) { log(LOG_DEBUG, - "Revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%llx, length %ld\n", + "Revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%llx, length %d\n", rq->sdno, rq, rq->bio->bio_buf->b_flags & B_READ ? "Read" : "Write", @@ -359,7 +359,7 @@ launch_requests(struct request *rq, int reviveok) #if VINUMDEBUG if (debug & DEBUG_ADDRESSES) log(LOG_DEBUG, - "Request: %p\n%s dev %d.%d, offset 0x%llx, length %ld\n", + "Request: %p\n%s dev %d.%d, offset 0x%llx, length %d\n", rq, rq->bio->bio_buf->b_flags & B_READ ? "Read" : "Write", major(((dev_t)rq->bio->bio_driver_info)), @@ -422,7 +422,7 @@ launch_requests(struct request *rq, int reviveok) #ifdef VINUMDEBUG if (debug & DEBUG_ADDRESSES) log(LOG_DEBUG, - " %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %ld\n", + " %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %d\n", rqe->b.b_flags & B_READ ? "Read" : "Write", major(dev), minor(dev), @@ -973,7 +973,7 @@ sdio(struct bio *bio) #if VINUMDEBUG if (debug & DEBUG_ADDRESSES) log(LOG_DEBUG, - " %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %ld\n", + " %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %d\n", sbp->b.b_flags & B_READ ? "Read" : "Write", major(sddev), minor(sddev), diff --git a/sys/dev/raid/vinum/vinumrevive.c b/sys/dev/raid/vinum/vinumrevive.c index 19247b7e97..fe59c7e8a8 100644 --- a/sys/dev/raid/vinum/vinumrevive.c +++ b/sys/dev/raid/vinum/vinumrevive.c @@ -39,7 +39,7 @@ * * $Id: vinumrevive.c,v 1.14 2000/12/21 01:55:11 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.22.2.5 2001/03/13 02:59:43 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumrevive.c,v 1.7 2006/03/24 18:35:32 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumrevive.c,v 1.8 2006/03/26 07:56:54 swildner Exp $ */ #include "vinumhdr.h" @@ -203,7 +203,7 @@ revive_block(int sdno) if (debug & DEBUG_REVIVECONFLICT) { dev = rq->bio->bio_driver_info; log(LOG_DEBUG, - "Relaunch revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%llx, length %ld\n", + "Relaunch revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%llx, length %d\n", rq->sdno, rq, rq->bio->bio_buf->b_flags & B_READ ? "Read" : "Write", diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index a9c541ff20..6af8c0f91d 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -34,7 +34,7 @@ * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 * $FreeBSD: src/sys/kern/vfs_cluster.c,v 1.92.2.9 2001/11/18 07:10:59 dillon Exp $ - * $DragonFly: src/sys/kern/vfs_cluster.c,v 1.19 2006/03/24 18:35:33 dillon Exp $ + * $DragonFly: src/sys/kern/vfs_cluster.c,v 1.20 2006/03/26 07:56:54 swildner Exp $ */ #include "opt_debug_cluster.h" @@ -245,7 +245,7 @@ no_read_ahead: if (bp) { #if defined(CLUSTERDEBUG) if (rcluster) - printf("S(%lld,%ld,%d) ", + printf("S(%lld,%d,%d) ", bp->b_loffset, bp->b_bcount, seqcount); #endif if ((bp->b_flags & B_CLUSTER) == 0) { @@ -272,12 +272,12 @@ no_read_ahead: #if defined(CLUSTERDEBUG) if (rcluster) { if (bp) - printf("A+(%lld,%ld,%lld,%d) ", + printf("A+(%lld,%d,%lld,%d) ", rbp->b_loffset, rbp->b_bcount, rbp->b_loffset - origoffset, seqcount); else - printf("A(%lld,%ld,%lld,%d) ", + printf("A(%lld,%d,%lld,%d) ", rbp->b_loffset, rbp->b_bcount, rbp->b_loffset - origoffset, seqcount);