Explicitly cast daddr_t's to long long's when printing them since daddr_t

is not long long on all archs.  (They happen to be long's on 64-bit arch's
and gcc considers that significant enough to warn about it.)  These should
probably be uintmax_t but I didn't feel like adding all the extra includes.

4 files changed, 13 insertions, 13 deletions

diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 16edfdd..16036e8 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -114,7 +114,7 @@ vinum_daemon(void)
 			rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",
 			major(rq->bp->b_dev),
 			minor(rq->bp->b_dev),
-			rq->bp->b_blkno,
+			(long long)rq->bp->b_blkno,
 			rq->bp->b_bcount);
 		}
 		recover_io(request->info.rq);		    /* the failed request */
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 0d40bf2..fdefee4 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -103,7 +103,7 @@ complete_rqe(struct buf *bp)
 		"%s:%s read error, block %lld for %ld bytes\n",
 		gravity,
 		sd->name,
-		bp->b_blkno,
+		(long long)bp->b_blkno,
 		bp->b_bcount);
 	} else {					    /* write operation */
 	    if ((rq->error == ENXIO) || (sd->flags & VF_RETRYERRORS) == 0) {
@@ -114,19 +114,19 @@ complete_rqe(struct buf *bp)
 		"%s:%s write error, block %lld for %ld bytes\n",
 		gravity,
 		sd->name,
-		bp->b_blkno,
+		(long long)bp->b_blkno,
 		bp->b_bcount);
 	}
 	log(LOG_ERR,
 	    "%s: user buffer block %lld for %ld bytes\n",
 	    sd->name,
-	    ubp->b_blkno,
+	    (long long)ubp->b_blkno,
 	    ubp->b_bcount);
 	if (rq->error == ENXIO) {			    /* the drive's down too */
 	    log(LOG_ERR,
 		"%s: fatal drive I/O error, block %lld for %ld bytes\n",
 		DRIVE[rqe->driveno].label.name,
-		bp->b_blkno,
+		(long long)bp->b_blkno,
 		bp->b_bcount);
 	    DRIVE[rqe->driveno].lasterror = rq->error;
 	    set_drive_state(rqe->driveno,		    /* take the drive down */
@@ -415,7 +415,7 @@ complete_raid5_write(struct rqelement *rqe)
 			    minor(rqe->b.b_dev),
 			    rqe->sdno,
 			    (u_int) (rqe->b.b_blkno - SD[rqe->sdno].driveoffset),
-			    rqe->b.b_blkno,
+			    (long long)rqe->b.b_blkno,
 			    rqe->b.b_bcount);
 		    if (debug & DEBUG_LASTREQS)
 			logrq(loginfo_raid5_data, (union rqinfou) rqe, ubp);
@@ -454,7 +454,7 @@ complete_raid5_write(struct rqelement *rqe)
 	    minor(rqe->b.b_dev),
 	    rqe->sdno,
 	    (u_int) (rqe->b.b_blkno - SD[rqe->sdno].driveoffset),
-	    rqe->b.b_blkno,
+	    (long long)rqe->b.b_blkno,
 	    rqe->b.b_bcount);
     if (debug & DEBUG_LASTREQS)
 	logrq(loginfo_raid5_parity, (union rqinfou) rqe, ubp);
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 8e6834a..56086a4 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -346,7 +346,7 @@ launch_requests(struct request *rq, int reviveok)
 		rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",
 		major(rq->bp->b_dev),
 		minor(rq->bp->b_dev),
-		rq->bp->b_blkno,
+		(long long)rq->bp->b_blkno,
 		rq->bp->b_bcount);
 #endif
 	return 0;					    /* and get out of here */
@@ -360,7 +360,7 @@ launch_requests(struct request *rq, int reviveok)
 	    rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",
 	    major(rq->bp->b_dev),
 	    minor(rq->bp->b_dev),
-	    rq->bp->b_blkno,
+	    (long long)rq->bp->b_blkno,
 	    rq->bp->b_bcount);
     vinum_conf.lastrq = rq;
     vinum_conf.lastbuf = rq->bp;
@@ -433,7 +433,7 @@ launch_requests(struct request *rq, int reviveok)
 			minor(rqe->b.b_dev),
 			rqe->sdno,
 			(u_int) (rqe->b.b_blkno - SD[rqe->sdno].driveoffset),
-			rqe->b.b_blkno,
+			(long long)rqe->b.b_blkno,
 			rqe->b.b_bcount);
 		if (debug & DEBUG_LASTREQS)
 		    logrq(loginfo_rqe, (union rqinfou) rqe, rq->bp);
@@ -634,7 +634,7 @@ bre(struct request *rq,
 			    plex->name,
 			    sd->name,
 			    (u_int) sd->sectors,
-			    bp->b_blkno);
+			    (long long)bp->b_blkno);
 			log(LOG_DEBUG,
 			    "vinum: stripebase %#llx, stripeoffset %#llxx, blockoffset %#llx\n",
 			    (unsigned long long)stripebase,
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 16b878a..d74d5d3 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -208,7 +208,7 @@ revive_block(int sdno)
 		    rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",
 		    major(rq->bp->b_dev),
 		    minor(rq->bp->b_dev),
-		    rq->bp->b_blkno,
+		    (long long)rq->bp->b_blkno,
 		    rq->bp->b_bcount);
 #endif
 	    launch_requests(sd->waitlist, 1);		    /* do them now */
@@ -305,7 +305,7 @@ parityops(struct vinum_ioctl_msg *data)
 		reply->error = EIO;
 	    sprintf(reply->msg,
 		"Parity incorrect at offset 0x%llx\n",
-		errorloc);
+		(long long)errorloc);
 	}
 	if (reply->error == EAGAIN) {			    /* still OK, */
 	    plex->checkblock = pstripe + (pbp->b_bcount >> DEV_BSHIFT);	/* moved this much further down */