Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/vinum add some (long long int) casts for log() argum...
details: https://anonhg.NetBSD.org/src/rev/34973f6de56b
branches: trunk
changeset: 555702:34973f6de56b
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Tue Nov 25 20:11:59 2003 +0000
description:
add some (long long int) casts for log() arguments, so that this compiles
on LP64
fixed port-alpha/23566 by Paul Mather
diffstat:
sys/dev/vinum/vinumdaemon.c | 4 ++--
sys/dev/vinum/vinuminterrupt.c | 10 +++++-----
sys/dev/vinum/vinumrevive.c | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diffs (86 lines):
diff -r ba113a01b9dd -r 34973f6de56b sys/dev/vinum/vinumdaemon.c
--- a/sys/dev/vinum/vinumdaemon.c Tue Nov 25 19:34:05 2003 +0000
+++ b/sys/dev/vinum/vinumdaemon.c Tue Nov 25 20:11:59 2003 +0000
@@ -34,7 +34,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumdaemon.c,v 1.1.1.1 2003/10/10 03:08:04 grog Exp $
+ * $Id: vinumdaemon.c,v 1.2 2003/11/25 20:11:59 jdolecek Exp $
* $FreeBSD$
*/
@@ -109,7 +109,7 @@
rq->bp->b_flags & B_READ ? "Read" : "Write",
major(rq->bp->b_dev),
minor(rq->bp->b_dev),
- rq->bp->b_blkno,
+ (long long int) rq->bp->b_blkno,
rq->bp->b_bcount);
}
recover_io(request->info.rq); /* the failed request */
diff -r ba113a01b9dd -r 34973f6de56b sys/dev/vinum/vinuminterrupt.c
--- a/sys/dev/vinum/vinuminterrupt.c Tue Nov 25 19:34:05 2003 +0000
+++ b/sys/dev/vinum/vinuminterrupt.c Tue Nov 25 20:11:59 2003 +0000
@@ -39,7 +39,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinuminterrupt.c,v 1.1.1.1 2003/10/10 03:08:17 grog Exp $
+ * $Id: vinuminterrupt.c,v 1.2 2003/11/25 20:11:59 jdolecek Exp $
* $FreeBSD$
*/
@@ -103,7 +103,7 @@
"%s:%s read error, block %lld for %ld bytes\n",
gravity,
sd->name,
- bp->b_blkno,
+ (long long int) bp->b_blkno,
bp->b_bcount);
} else { /* write operation */
if ((rq->error == ENXIO) || (sd->flags & VF_RETRYERRORS) == 0) {
@@ -114,19 +114,19 @@
"%s:%s write error, block %lld for %ld bytes\n",
gravity,
sd->name,
- bp->b_blkno,
+ (long long int)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 int)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 int)bp->b_blkno,
bp->b_bcount);
DRIVE[rqe->driveno].lasterror = rq->error;
set_drive_state(rqe->driveno, /* take the drive down */
diff -r ba113a01b9dd -r 34973f6de56b sys/dev/vinum/vinumrevive.c
--- a/sys/dev/vinum/vinumrevive.c Tue Nov 25 19:34:05 2003 +0000
+++ b/sys/dev/vinum/vinumrevive.c Tue Nov 25 20:11:59 2003 +0000
@@ -37,7 +37,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumrevive.c,v 1.1.1.1 2003/10/10 03:09:22 grog Exp $
+ * $Id: vinumrevive.c,v 1.2 2003/11/25 20:11:59 jdolecek Exp $
* $FreeBSD$
*/
@@ -302,7 +302,7 @@
reply->error = EIO;
sprintf(reply->msg,
"Parity incorrect at offset 0x%llx\n",
- errorloc);
+ (long long int) errorloc);
}
if (reply->error == EAGAIN) { /* still OK, */
plex->checkblock = pstripe + (pbp->b_bcount >> DEV_BSHIFT); /* moved this much further down */
Home |
Main Index |
Thread Index |
Old Index