aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ccd/ccd.c2
-rw-r--r--sys/dev/md/md.c2
-rw-r--r--sys/dev/vinum/vinumdaemon.c2
-rw-r--r--sys/dev/vinum/vinuminterrupt.c12
-rw-r--r--sys/dev/vinum/vinumrequest.c8
-rw-r--r--sys/dev/vinum/vinumrevive.c2
6 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index a1d196582a36..72b2f7ea2d6c 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1173,7 +1173,7 @@ ccdiodone(struct bio *ibp)
bp->bio_error = cbp->cb_buf.bio_error ?
cbp->cb_buf.bio_error : EIO;
}
- printf("ccd%d: error %d on component %d block %d (ccd block %d)%s\n",
+ printf("ccd%d: error %d on component %d block %d (ccd block %lld)%s\n",
unit, bp->bio_error, cbp->cb_comp,
(int)cbp->cb_buf.bio_blkno, bp->bio_blkno, msg);
}
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index c1ddf8a92ff9..27f54994d70e 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -383,7 +383,7 @@ mdstrategy(struct bio *bp)
int error;
if (md_debug > 1)
- printf("mdstrategy(%p) %s %x, %d, %ld, %p)\n",
+ printf("mdstrategy(%p) %s %x, %lld, %ld, %p)\n",
bp, devtoname(bp->bio_dev), bp->bio_flags, bp->bio_blkno,
bp->bio_bcount / DEV_BSIZE, bp->bio_data);
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index f03d36bca91d..570495b9ee6a 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -109,7 +109,7 @@ vinum_daemon(void)
struct request *rq = request->info.rq;
log(LOG_WARNING,
- "vinum: recovering I/O request: %p\n%s dev %d.%d, offset 0x%x, length %ld\n",
+ "vinum: recovering I/O request: %p\n%s dev %d.%d, offset 0x%llx, length %ld\n",
rq,
rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",
major(rq->bp->b_dev),
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 288fa580f560..0d40bf21323d 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -100,7 +100,7 @@ complete_rqe(struct buf *bp)
set_sd_state(rqe->sdno, sd_crashed, setstate_force); /* subdisk is crashed */
}
log(LOG_ERR,
- "%s:%s read error, block %d for %ld bytes\n",
+ "%s:%s read error, block %lld for %ld bytes\n",
gravity,
sd->name,
bp->b_blkno,
@@ -111,20 +111,20 @@ complete_rqe(struct buf *bp)
set_sd_state(rqe->sdno, sd_stale, setstate_force); /* subdisk is stale */
}
log(LOG_ERR,
- "%s:%s write error, block %d for %ld bytes\n",
+ "%s:%s write error, block %lld for %ld bytes\n",
gravity,
sd->name,
bp->b_blkno,
bp->b_bcount);
}
log(LOG_ERR,
- "%s: user buffer block %d for %ld bytes\n",
+ "%s: user buffer block %lld for %ld bytes\n",
sd->name,
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 %d for %ld bytes\n",
+ "%s: fatal drive I/O error, block %lld for %ld bytes\n",
DRIVE[rqe->driveno].label.name,
bp->b_blkno,
bp->b_bcount);
@@ -409,7 +409,7 @@ complete_raid5_write(struct rqelement *rqe)
#ifdef VINUMDEBUG
if (debug & DEBUG_ADDRESSES)
log(LOG_DEBUG,
- " %s dev %d.%d, sd %d, offset 0x%x, devoffset 0x%x, length %ld\n",
+ " %s dev %d.%d, sd %d, offset 0x%x, devoffset 0x%llx, length %ld\n",
rqe->b.b_iocmd == BIO_READ ? "Read" : "Write",
major(rqe->b.b_dev),
minor(rqe->b.b_dev),
@@ -448,7 +448,7 @@ complete_raid5_write(struct rqelement *rqe)
#ifdef VINUMDEBUG
if (debug & DEBUG_ADDRESSES)
log(LOG_DEBUG,
- " %s dev %d.%d, sd %d, offset 0x%x, devoffset 0x%x, length %ld\n",
+ " %s dev %d.%d, sd %d, offset 0x%x, devoffset 0x%llx, length %ld\n",
rqe->b.b_iocmd == BIO_READ ? "Read" : "Write",
major(rqe->b.b_dev),
minor(rqe->b.b_dev),
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index e7cd1c4cc48d..9dde28c1af07 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -340,7 +340,7 @@ launch_requests(struct request *rq, int reviveok)
#ifdef VINUMDEBUG
if (debug & DEBUG_REVIVECONFLICT)
log(LOG_DEBUG,
- "Revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%x, length %ld\n",
+ "Revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%llx, length %ld\n",
rq->sdno,
rq,
rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",
@@ -355,7 +355,7 @@ launch_requests(struct request *rq, int reviveok)
#ifdef VINUMDEBUG
if (debug & DEBUG_ADDRESSES)
log(LOG_DEBUG,
- "Request: %p\n%s dev %d.%d, offset 0x%x, length %ld\n",
+ "Request: %p\n%s dev %d.%d, offset 0x%llx, length %ld\n",
rq,
rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",
major(rq->bp->b_dev),
@@ -427,7 +427,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%x, devoffset 0x%x, length %ld\n",
+ " %s dev %d.%d, sd %d, offset 0x%x, devoffset 0x%llx, length %ld\n",
rqe->b.b_iocmd == BIO_READ ? "Read" : "Write",
major(rqe->b.b_dev),
minor(rqe->b.b_dev),
@@ -630,7 +630,7 @@ bre(struct request *rq,
#ifdef VINUMDEBUG
if (debug & DEBUG_EOFINFO) { /* tell on the request */
log(LOG_DEBUG,
- "vinum: EOF on plex %s, sd %s offset %x (user offset %x)\n",
+ "vinum: EOF on plex %s, sd %s offset %x (user offset %llx)\n",
plex->name,
sd->name,
(u_int) sd->sectors,
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 85b73f3f011c..1e368dbed95c 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -201,7 +201,7 @@ revive_block(int sdno)
if (debug & DEBUG_REVIVECONFLICT)
log(LOG_DEBUG,
- "Relaunch revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%x, length %ld\n",
+ "Relaunch revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%llx, length %ld\n",
rq->sdno,
rq,
rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",