Fix compiler warnings after 64bit daddr_t change.
This commit is contained in:
parent
0e936e5ed7
commit
14757120f4
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: adutil.c,v 1.1 2002/12/23 17:15:26 jdolecek Exp $ */
|
/* $NetBSD: adutil.c,v 1.2 2003/01/27 04:08:45 lonewolf Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1994 Christian E. Hopps
|
* Copyright (c) 1994 Christian E. Hopps
|
||||||
@ -32,7 +32,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: adutil.c,v 1.1 2002/12/23 17:15:26 jdolecek Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: adutil.c,v 1.2 2003/01/27 04:08:45 lonewolf Exp $");
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/vnode.h>
|
#include <sys/vnode.h>
|
||||||
@ -113,7 +113,7 @@ adosfs_getblktype(amp, bp)
|
|||||||
{
|
{
|
||||||
if (adoscksum(bp, amp->nwords)) {
|
if (adoscksum(bp, amp->nwords)) {
|
||||||
#ifdef DIAGNOSTIC
|
#ifdef DIAGNOSTIC
|
||||||
printf("adosfs: aget: cksum of blk %ld failed\n",
|
printf("adosfs: aget: cksum of blk %" PRId64 " failed\n",
|
||||||
bp->b_blkno / (amp->bsize / DEV_BSIZE));
|
bp->b_blkno / (amp->bsize / DEV_BSIZE));
|
||||||
#endif
|
#endif
|
||||||
return (-1);
|
return (-1);
|
||||||
@ -124,7 +124,7 @@ adosfs_getblktype(amp, bp)
|
|||||||
*/
|
*/
|
||||||
if (adoswordn(bp, 0) != BPT_SHORT) {
|
if (adoswordn(bp, 0) != BPT_SHORT) {
|
||||||
#ifdef DIAGNOSTIC
|
#ifdef DIAGNOSTIC
|
||||||
printf("adosfs: aget: bad primary type blk %ld (type = %d)\n",
|
printf("adosfs: aget: bad primary type blk %" PRId64 " (type = %d)\n",
|
||||||
bp->b_blkno / (amp->bsize / DEV_BSIZE), adoswordn(bp,0));
|
bp->b_blkno / (amp->bsize / DEV_BSIZE), adoswordn(bp,0));
|
||||||
#endif
|
#endif
|
||||||
return (-1);
|
return (-1);
|
||||||
@ -149,7 +149,7 @@ adosfs_getblktype(amp, bp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DIAGNOSTIC
|
#ifdef DIAGNOSTIC
|
||||||
printf("adosfs: aget: bad secondary type blk %ld (type = %d)\n",
|
printf("adosfs: aget: bad secondary type blk %" PRId64 " (type = %d)\n",
|
||||||
bp->b_blkno / (amp->bsize / DEV_BSIZE), adoswordn(bp, amp->nwords - 1));
|
bp->b_blkno / (amp->bsize / DEV_BSIZE), adoswordn(bp, amp->nwords - 1));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: advnops.c,v 1.3 2003/01/24 21:55:17 fvdl Exp $ */
|
/* $NetBSD: advnops.c,v 1.4 2003/01/27 04:08:45 lonewolf Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1994 Christian E. Hopps
|
* Copyright (c) 1994 Christian E. Hopps
|
||||||
@ -32,7 +32,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.3 2003/01/24 21:55:17 fvdl Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.4 2003/01/27 04:08:45 lonewolf Exp $");
|
||||||
|
|
||||||
#if defined(_KERNEL_OPT)
|
#if defined(_KERNEL_OPT)
|
||||||
#include "opt_quota.h"
|
#include "opt_quota.h"
|
||||||
@ -322,13 +322,13 @@ adosfs_read(v)
|
|||||||
error = EIO; /* OFS needs the complete block */
|
error = EIO; /* OFS needs the complete block */
|
||||||
else if (adoswordn(bp, 0) != BPT_DATA) {
|
else if (adoswordn(bp, 0) != BPT_DATA) {
|
||||||
#ifdef DIAGNOSTIC
|
#ifdef DIAGNOSTIC
|
||||||
printf("adosfs: bad primary type blk %ld\n",
|
printf("adosfs: bad primary type blk %" PRId64 "\n",
|
||||||
bp->b_blkno / (amp->bsize / DEV_BSIZE));
|
bp->b_blkno / (amp->bsize / DEV_BSIZE));
|
||||||
#endif
|
#endif
|
||||||
error = EINVAL;
|
error = EINVAL;
|
||||||
} else if (adoscksum(bp, ap->nwords)) {
|
} else if (adoscksum(bp, ap->nwords)) {
|
||||||
#ifdef DIAGNOSTIC
|
#ifdef DIAGNOSTIC
|
||||||
printf("adosfs: blk %ld failed cksum.\n",
|
printf("adosfs: blk %" PRId64 " failed cksum.\n",
|
||||||
bp->b_blkno / (amp->bsize / DEV_BSIZE));
|
bp->b_blkno / (amp->bsize / DEV_BSIZE));
|
||||||
#endif
|
#endif
|
||||||
error = EINVAL;
|
error = EINVAL;
|
||||||
@ -571,7 +571,7 @@ adosfs_bmap(v)
|
|||||||
*bnp = adoswordn(flbp, flblkoff) * ap->amp->bsize / DEV_BSIZE;
|
*bnp = adoswordn(flbp, flblkoff) * ap->amp->bsize / DEV_BSIZE;
|
||||||
} else {
|
} else {
|
||||||
#ifdef DIAGNOSTIC
|
#ifdef DIAGNOSTIC
|
||||||
printf("flblk offset %ld too large in lblk %ld blk %d\n",
|
printf("flblk offset %ld too large in lblk %ld blk %" PRId64 "\n",
|
||||||
flblkoff, (long)bn, flbp->b_blkno);
|
flblkoff, (long)bn, flbp->b_blkno);
|
||||||
#endif
|
#endif
|
||||||
error = EINVAL;
|
error = EINVAL;
|
||||||
|
Loading…
Reference in New Issue
Block a user