From 8fdbc99b69e934ed7445d8309f0f3a4dfc6010a5 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Fri, 17 May 2002 18:59:53 +0000 Subject: [PATCH] Fix ufs_daddr_t/daddr_t type problems. Sponsored by: DARPA & NAI labs. --- sys/ufs/ffs/ffs_softdep.c | 2 +- sys/ufs/ufs/ufs_bmap.c | 2 +- sys/ufs/ufs/ufs_readwrite.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 5408448bd9a..a1422acfcf4 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -1658,7 +1658,7 @@ setup_allocindir_phase2(bp, ip, aip) struct allocindir *oldaip; struct freefrag *freefrag; struct newblk *newblk; - daddr_t blkno; + ufs_daddr_t blkno; if (bp->b_lblkno >= 0) panic("setup_allocindir_phase2: not indir blk"); diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 7c433184117..34d3fa3383b 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -71,7 +71,7 @@ ufs_bmap(ap) int *a_runb; } */ *ap; { - daddr_t blkno; + ufs_daddr_t blkno; int error; /* diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c index 1831a4288db..af7298c2602 100644 --- a/sys/ufs/ufs/ufs_readwrite.c +++ b/sys/ufs/ufs/ufs_readwrite.c @@ -68,7 +68,7 @@ READ(ap) struct uio *uio; FS *fs; struct buf *bp; - ufs_daddr_t lbn, nextlbn; + daddr_t lbn, nextlbn; off_t bytesinfile; long size, xfersize, blkoffset; int error, orig_resid; @@ -606,7 +606,7 @@ ffs_getpages(ap) int pbackwards, pforwards; int firstpage; int reqlblkno; - daddr_t reqblkno; + ufs_daddr_t reqblkno; int poff; int pcount; int rtval; -- 2.45.2