summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/ext2fs/ext2fs.h6
-rw-r--r--sys/ufs/ext2fs/ext2fs_alloc.c42
-rw-r--r--sys/ufs/ext2fs/ext2fs_balloc.c16
-rw-r--r--sys/ufs/ext2fs/ext2fs_bmap.c16
-rw-r--r--sys/ufs/ext2fs/ext2fs_extern.h12
-rw-r--r--sys/ufs/ext2fs/ext2fs_inode.c26
-rw-r--r--sys/ufs/ext2fs/ext2fs_readwrite.c6
-rw-r--r--sys/ufs/ext2fs/ext2fs_subr.c6
-rw-r--r--sys/ufs/ext2fs/ext2fs_vfsops.c4
-rw-r--r--sys/ufs/ffs/ffs_alloc.c6
-rw-r--r--sys/ufs/ffs/ffs_balloc.c4
-rw-r--r--sys/ufs/ffs/ffs_extern.h12
-rw-r--r--sys/ufs/ffs/ffs_softdep.c46
-rw-r--r--sys/ufs/ffs/ffs_softdep_stub.c14
-rw-r--r--sys/ufs/ffs/softdep.h18
-rw-r--r--sys/ufs/ufs/dinode.h9
-rw-r--r--sys/ufs/ufs/inode.h8
-rw-r--r--sys/ufs/ufs/ufs_bmap.c16
-rw-r--r--sys/ufs/ufs/ufs_quota_stub.c6
-rw-r--r--sys/ufs/ufs/ufs_vnops.c4
20 files changed, 139 insertions, 138 deletions
diff --git a/sys/ufs/ext2fs/ext2fs.h b/sys/ufs/ext2fs/ext2fs.h
index fa70ec75dc0..d2960a4f017 100644
--- a/sys/ufs/ext2fs/ext2fs.h
+++ b/sys/ufs/ext2fs/ext2fs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs.h,v 1.7 2002/07/29 04:01:09 fgsch Exp $ */
+/* $OpenBSD: ext2fs.h,v 1.8 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs.h,v 1.10 2000/01/28 16:00:23 bouyer Exp $ */
/*
@@ -59,8 +59,8 @@
#define SBSIZE 1024
#define BBOFF ((off_t)(0))
#define SBOFF ((off_t)(BBOFF + BBSIZE))
-#define BBLOCK ((ufs_daddr_t)(0))
-#define SBLOCK ((ufs_daddr_t)(BBLOCK + BBSIZE / DEV_BSIZE))
+#define BBLOCK ((ufs1_daddr_t)(0))
+#define SBLOCK ((ufs1_daddr_t)(BBLOCK + BBSIZE / DEV_BSIZE))
/*
* Addresses stored in inodes are capable of addressing blocks
diff --git a/sys/ufs/ext2fs/ext2fs_alloc.c b/sys/ufs/ext2fs/ext2fs_alloc.c
index 9b2cf175a22..9697b5aa552 100644
--- a/sys/ufs/ext2fs/ext2fs_alloc.c
+++ b/sys/ufs/ext2fs/ext2fs_alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_alloc.c,v 1.9 2002/03/14 03:16:13 millert Exp $ */
+/* $OpenBSD: ext2fs_alloc.c,v 1.10 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs_alloc.c,v 1.10 2001/07/05 08:38:27 toshii Exp $ */
/*
@@ -56,13 +56,13 @@
u_long ext2gennumber;
-static ufs_daddr_t ext2fs_alloccg(struct inode *, int, ufs_daddr_t, int);
+static ufs1_daddr_t ext2fs_alloccg(struct inode *, int, ufs1_daddr_t, int);
static u_long ext2fs_dirpref(struct m_ext2fs *);
static void ext2fs_fserr(struct m_ext2fs *, u_int, char *);
static u_long ext2fs_hashalloc(struct inode *, int, long, int,
- ufs_daddr_t (*)(struct inode *, int, ufs_daddr_t, int));
-static ufs_daddr_t ext2fs_nodealloccg(struct inode *, int, ufs_daddr_t, int);
-static ufs_daddr_t ext2fs_mapsearch(struct m_ext2fs *, char *, ufs_daddr_t);
+ ufs1_daddr_t (*)(struct inode *, int, ufs1_daddr_t, int));
+static ufs1_daddr_t ext2fs_nodealloccg(struct inode *, int, ufs1_daddr_t, int);
+static ufs1_daddr_t ext2fs_mapsearch(struct m_ext2fs *, char *, ufs1_daddr_t);
/*
* Allocate a block in the file system.
@@ -84,12 +84,12 @@ static ufs_daddr_t ext2fs_mapsearch(struct m_ext2fs *, char *, ufs_daddr_t);
int
ext2fs_alloc(ip, lbn, bpref, cred, bnp)
struct inode *ip;
- ufs_daddr_t lbn, bpref;
+ ufs1_daddr_t lbn, bpref;
struct ucred *cred;
- ufs_daddr_t *bnp;
+ ufs1_daddr_t *bnp;
{
struct m_ext2fs *fs;
- ufs_daddr_t bno;
+ ufs1_daddr_t bno;
int cg;
*bnp = 0;
@@ -108,7 +108,7 @@ ext2fs_alloc(ip, lbn, bpref, cred, bnp)
cg = ino_to_cg(fs, ip->i_number);
else
cg = dtog(fs, bpref);
- bno = (ufs_daddr_t)ext2fs_hashalloc(ip, cg, bpref, fs->e2fs_bsize,
+ bno = (ufs1_daddr_t)ext2fs_hashalloc(ip, cg, bpref, fs->e2fs_bsize,
ext2fs_alloccg);
if (bno > 0) {
ip->i_e2fs_nblock += btodb(fs->e2fs_bsize);
@@ -225,12 +225,12 @@ ext2fs_dirpref(fs)
* contigously. The two fields of the ext2 inode extension (see
* ufs/ufs/inode.h) help this.
*/
-ufs_daddr_t
+ufs1_daddr_t
ext2fs_blkpref(ip, lbn, indx, bap)
struct inode *ip;
- ufs_daddr_t lbn;
+ ufs1_daddr_t lbn;
int indx;
- ufs_daddr_t *bap;
+ ufs1_daddr_t *bap;
{
struct m_ext2fs *fs;
int cg, i;
@@ -278,7 +278,7 @@ ext2fs_hashalloc(ip, cg, pref, size, allocator)
int cg;
long pref;
int size; /* size for data blocks, mode for inodes */
- ufs_daddr_t (*allocator)(struct inode *, int, ufs_daddr_t, int);
+ ufs1_daddr_t (*allocator)(struct inode *, int, ufs1_daddr_t, int);
{
struct m_ext2fs *fs;
long result;
@@ -326,11 +326,11 @@ ext2fs_hashalloc(ip, cg, pref, size, allocator)
* and if it is, allocate it.
*/
-static ufs_daddr_t
+static ufs1_daddr_t
ext2fs_alloccg(ip, cg, bpref, size)
struct inode *ip;
int cg;
- ufs_daddr_t bpref;
+ ufs1_daddr_t bpref;
int size;
{
struct m_ext2fs *fs;
@@ -414,11 +414,11 @@ gotit:
* 2) allocate the next available inode after the requested
* inode in the specified cylinder group.
*/
-static ufs_daddr_t
+static ufs1_daddr_t
ext2fs_nodealloccg(ip, cg, ipref, mode)
struct inode *ip;
int cg;
- ufs_daddr_t ipref;
+ ufs1_daddr_t ipref;
int mode;
{
struct m_ext2fs *fs;
@@ -489,7 +489,7 @@ gotit:
void
ext2fs_blkfree(ip, bno)
struct inode *ip;
- ufs_daddr_t bno;
+ ufs1_daddr_t bno;
{
struct m_ext2fs *fs;
char *bbp;
@@ -576,13 +576,13 @@ ext2fs_inode_free(struct inode *pip, ino_t ino, int mode)
* available.
*/
-static ufs_daddr_t
+static ufs1_daddr_t
ext2fs_mapsearch(fs, bbp, bpref)
struct m_ext2fs *fs;
char *bbp;
- ufs_daddr_t bpref;
+ ufs1_daddr_t bpref;
{
- ufs_daddr_t bno;
+ ufs1_daddr_t bno;
int start, len, loc, i, map;
/*
diff --git a/sys/ufs/ext2fs/ext2fs_balloc.c b/sys/ufs/ext2fs/ext2fs_balloc.c
index eb2d7a6f414..74dfbe9d7a6 100644
--- a/sys/ufs/ext2fs/ext2fs_balloc.c
+++ b/sys/ufs/ext2fs/ext2fs_balloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_balloc.c,v 1.11 2001/12/19 08:58:07 art Exp $ */
+/* $OpenBSD: ext2fs_balloc.c,v 1.12 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs_balloc.c,v 1.10 2001/07/04 21:16:01 chs Exp $ */
/*
@@ -64,14 +64,14 @@ ext2fs_buf_alloc(struct inode *ip, daddr_t bn, int size, struct ucred *cred,
struct buf **bpp, int flags)
{
struct m_ext2fs *fs;
- ufs_daddr_t nb;
+ ufs1_daddr_t nb;
struct buf *bp, *nbp;
struct vnode *vp = ITOV(ip);
struct indir indirs[NIADDR + 2];
- ufs_daddr_t newb, lbn, *bap, pref;
+ ufs1_daddr_t newb, lbn, *bap, pref;
int num, i, error;
u_int deallocated;
- ufs_daddr_t *allocib, *blkp, *allocblk, allociblk[NIADDR + 1];
+ ufs1_daddr_t *allocib, *blkp, *allocblk, allociblk[NIADDR + 1];
int unwindidx = -1;
*bpp = NULL;
@@ -132,7 +132,7 @@ ext2fs_buf_alloc(struct inode *ip, daddr_t bn, int size, struct ucred *cred,
allocib = NULL;
allocblk = allociblk;
if (nb == 0) {
- pref = ext2fs_blkpref(ip, lbn, 0, (ufs_daddr_t *)0);
+ pref = ext2fs_blkpref(ip, lbn, 0, (ufs1_daddr_t *)0);
error = ext2fs_alloc(ip, lbn, pref, cred, &newb);
if (error)
return (error);
@@ -163,7 +163,7 @@ ext2fs_buf_alloc(struct inode *ip, daddr_t bn, int size, struct ucred *cred,
brelse(bp);
goto fail;
}
- bap = (ufs_daddr_t *)bp->b_data;
+ bap = (ufs1_daddr_t *)bp->b_data;
nb = fs2h32(bap[indirs[i].in_off]);
if (i == num)
break;
@@ -172,7 +172,7 @@ ext2fs_buf_alloc(struct inode *ip, daddr_t bn, int size, struct ucred *cred,
brelse(bp);
continue;
}
- pref = ext2fs_blkpref(ip, lbn, 0, (ufs_daddr_t *)0);
+ pref = ext2fs_blkpref(ip, lbn, 0, (ufs1_daddr_t *)0);
error = ext2fs_alloc(ip, lbn, pref, cred, &newb);
if (error) {
brelse(bp);
@@ -271,7 +271,7 @@ fail:
panic("Could not unwind indirect block, error %d", r);
brelse(bp);
} else {
- bap = (ufs_daddr_t *)bp->b_data;
+ bap = (ufs1_daddr_t *)bp->b_data;
bap[indirs[unwindidx].in_off] = 0;
if (flags & B_SYNC)
bwrite(bp);
diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c
index 20b4cdec845..effa156c7b2 100644
--- a/sys/ufs/ext2fs/ext2fs_bmap.c
+++ b/sys/ufs/ext2fs/ext2fs_bmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_bmap.c,v 1.8 2002/03/14 01:27:14 millert Exp $ */
+/* $OpenBSD: ext2fs_bmap.c,v 1.9 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs_bmap.c,v 1.5 2000/03/30 12:41:11 augustss Exp $ */
/*
@@ -61,7 +61,7 @@
#include <ufs/ext2fs/ext2fs.h>
#include <ufs/ext2fs/ext2fs_extern.h>
-static int ext2fs_bmaparray(struct vnode *, ufs_daddr_t, ufs_daddr_t *,
+static int ext2fs_bmaparray(struct vnode *, ufs1_daddr_t, ufs1_daddr_t *,
struct indir *, int *, int *);
/*
@@ -110,8 +110,8 @@ ext2fs_bmap(v)
int
ext2fs_bmaparray(vp, bn, bnp, ap, nump, runp)
struct vnode *vp;
- ufs_daddr_t bn;
- ufs_daddr_t *bnp;
+ ufs1_daddr_t bn;
+ ufs1_daddr_t *bnp;
struct indir *ap;
int *nump;
int *runp;
@@ -122,7 +122,7 @@ ext2fs_bmaparray(vp, bn, bnp, ap, nump, runp)
struct mount *mp;
struct vnode *devvp;
struct indir a[NIADDR+1], *xap;
- ufs_daddr_t daddr;
+ ufs1_daddr_t daddr;
long metalbn;
int error, maxrun = 0, num;
@@ -213,12 +213,12 @@ ext2fs_bmaparray(vp, bn, bnp, ap, nump, runp)
}
}
- daddr = fs2h32(((ufs_daddr_t *)bp->b_data)[xap->in_off]);
+ daddr = fs2h32(((ufs1_daddr_t *)bp->b_data)[xap->in_off]);
if (num == 1 && daddr && runp)
for (bn = xap->in_off + 1;
bn < MNINDIR(ump) && *runp < maxrun &&
- is_sequential(ump, ((ufs_daddr_t *)bp->b_data)[bn - 1],
- ((ufs_daddr_t *)bp->b_data)[bn]);
+ is_sequential(ump, ((ufs1_daddr_t *)bp->b_data)[bn - 1],
+ ((ufs1_daddr_t *)bp->b_data)[bn]);
++bn, ++*runp);
}
if (bp)
diff --git a/sys/ufs/ext2fs/ext2fs_extern.h b/sys/ufs/ext2fs/ext2fs_extern.h
index f9b721fafdd..0dd7f190dba 100644
--- a/sys/ufs/ext2fs/ext2fs_extern.h
+++ b/sys/ufs/ext2fs/ext2fs_extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_extern.h,v 1.15 2002/03/14 03:16:13 millert Exp $ */
+/* $OpenBSD: ext2fs_extern.h,v 1.16 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs_extern.h,v 1.1 1997/06/11 09:33:55 bouyer Exp $ */
/*-
@@ -60,15 +60,15 @@ extern struct pool ext2fs_inode_pool; /* memory pool for inodes */
__BEGIN_DECLS
/* ext2fs_alloc.c */
-int ext2fs_alloc(struct inode *, ufs_daddr_t, ufs_daddr_t , struct ucred *,
- ufs_daddr_t *);
-int ext2fs_realloccg(struct inode *, ufs_daddr_t, ufs_daddr_t, int, int,
+int ext2fs_alloc(struct inode *, ufs1_daddr_t, ufs1_daddr_t , struct ucred *,
+ ufs1_daddr_t *);
+int ext2fs_realloccg(struct inode *, ufs1_daddr_t, ufs1_daddr_t, int, int,
struct ucred *, struct buf **);
int ext2fs_reallocblks(void *);
int ext2fs_inode_alloc(struct inode *pip, int mode, struct ucred *,
struct vnode **);
-daddr_t ext2fs_blkpref(struct inode *, ufs_daddr_t, int, ufs_daddr_t *);
-void ext2fs_blkfree(struct inode *, ufs_daddr_t);
+daddr_t ext2fs_blkpref(struct inode *, ufs1_daddr_t, int, ufs1_daddr_t *);
+void ext2fs_blkfree(struct inode *, ufs1_daddr_t);
int ext2fs_inode_free(struct inode *pip, ino_t ino, int mode);
/* ext2fs_balloc.c */
diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index d70f10bce84..1d3cfa06982 100644
--- a/sys/ufs/ext2fs/ext2fs_inode.c
+++ b/sys/ufs/ext2fs/ext2fs_inode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_inode.c,v 1.21 2002/03/14 01:27:14 millert Exp $ */
+/* $OpenBSD: ext2fs_inode.c,v 1.22 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $ */
/*
@@ -60,8 +60,8 @@
#include <ufs/ext2fs/ext2fs.h>
#include <ufs/ext2fs/ext2fs_extern.h>
-static int ext2fs_indirtrunc(struct inode *, ufs_daddr_t, ufs_daddr_t,
- ufs_daddr_t, int, long *);
+static int ext2fs_indirtrunc(struct inode *, ufs1_daddr_t, ufs1_daddr_t,
+ ufs1_daddr_t, int, long *);
/*
* Last reference to an inode. If necessary, write or delete it.
@@ -171,9 +171,9 @@ int
ext2fs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred)
{
struct vnode *ovp = ITOV(oip);
- ufs_daddr_t lastblock;
- ufs_daddr_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR];
- ufs_daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
+ ufs1_daddr_t lastblock;
+ ufs1_daddr_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR];
+ ufs1_daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
struct m_ext2fs *fs;
struct buf *bp;
int offset, size, level;
@@ -382,17 +382,17 @@ done:
static int
ext2fs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
struct inode *ip;
- ufs_daddr_t lbn, lastbn;
- ufs_daddr_t dbn;
+ ufs1_daddr_t lbn, lastbn;
+ ufs1_daddr_t dbn;
int level;
long *countp;
{
int i;
struct buf *bp;
struct m_ext2fs *fs = ip->i_e2fs;
- ufs_daddr_t *bap;
+ ufs1_daddr_t *bap;
struct vnode *vp;
- ufs_daddr_t *copy = NULL, nb, nlbn, last;
+ ufs1_daddr_t *copy = NULL, nb, nlbn, last;
long blkcount, factor;
int nblocks, blocksreleased = 0;
int error = 0, allerror = 0;
@@ -434,9 +434,9 @@ ext2fs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
return (error);
}
- bap = (ufs_daddr_t *)bp->b_data;
+ bap = (ufs1_daddr_t *)bp->b_data;
if (lastbn >= 0) {
- MALLOC(copy, ufs_daddr_t *, fs->e2fs_bsize, M_TEMP, M_WAITOK);
+ MALLOC(copy, ufs1_daddr_t *, fs->e2fs_bsize, M_TEMP, M_WAITOK);
memcpy((caddr_t)copy, (caddr_t)bap, (u_int)fs->e2fs_bsize);
memset((caddr_t)&bap[last + 1], 0,
(u_int)(NINDIR(fs) - (last + 1)) * sizeof (u_int32_t));
@@ -457,7 +457,7 @@ ext2fs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
continue;
if (level > SINGLE) {
error = ext2fs_indirtrunc(ip, nlbn, fsbtodb(fs, nb),
- (ufs_daddr_t)-1, level - 1,
+ (ufs1_daddr_t)-1, level - 1,
&blkcount);
if (error)
allerror = error;
diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c
index 9f54b352c4d..03e0834803d 100644
--- a/sys/ufs/ext2fs/ext2fs_readwrite.c
+++ b/sys/ufs/ext2fs/ext2fs_readwrite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_readwrite.c,v 1.14 2002/03/30 10:37:40 niklas Exp $ */
+/* $OpenBSD: ext2fs_readwrite.c,v 1.15 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs_readwrite.c,v 1.16 2001/02/27 04:37:47 chs Exp $ */
/*-
@@ -80,7 +80,7 @@ ext2fs_read(v)
struct uio *uio;
struct m_ext2fs *fs;
struct buf *bp;
- ufs_daddr_t lbn, nextlbn;
+ ufs1_daddr_t lbn, nextlbn;
off_t bytesinfile;
long size, xfersize, blkoffset;
int error;
@@ -182,7 +182,7 @@ ext2fs_write(v)
struct m_ext2fs *fs;
struct buf *bp;
struct proc *p;
- ufs_daddr_t lbn;
+ ufs1_daddr_t lbn;
off_t osize;
int blkoffset, error, flags, ioflag, resid, size, xfersize;
diff --git a/sys/ufs/ext2fs/ext2fs_subr.c b/sys/ufs/ext2fs/ext2fs_subr.c
index 02d84be4302..357c3a3b748 100644
--- a/sys/ufs/ext2fs/ext2fs_subr.c
+++ b/sys/ufs/ext2fs/ext2fs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_subr.c,v 1.8 2001/12/19 08:58:07 art Exp $ */
+/* $OpenBSD: ext2fs_subr.c,v 1.9 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs_subr.c,v 1.1 1997/06/11 09:34:03 bouyer Exp $ */
/*
@@ -60,7 +60,7 @@ ext2fs_bufatoff(struct inode *ip, off_t offset, char **res, struct buf **bpp)
struct vnode *vp;
struct m_ext2fs *fs;
struct buf *bp;
- ufs_daddr_t lbn;
+ ufs1_daddr_t lbn;
int error;
vp = ITOV(ip);
@@ -86,7 +86,7 @@ ext2fs_checkoverlap(bp, ip)
struct inode *ip;
{
struct buf *ebp, *ep;
- ufs_daddr_t start, last;
+ ufs1_daddr_t start, last;
struct vnode *vp;
ebp = &buf[nbuf];
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 79c61f88022..26a4904a60e 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vfsops.c,v 1.25 2002/07/29 17:45:20 fgsch Exp $ */
+/* $OpenBSD: ext2fs_vfsops.c,v 1.26 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */
/*
@@ -415,7 +415,7 @@ ext2fs_reload(mountp, cred, p)
size = DEV_BSIZE;
else
size = dpart.disklab->d_secsize;
- error = bread(devvp, (ufs_daddr_t)(SBOFF / size), SBSIZE, NOCRED, &bp);
+ error = bread(devvp, (ufs1_daddr_t)(SBOFF / size), SBSIZE, NOCRED, &bp);
if (error) {
brelse(bp);
return (error);
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 76946df2b6b..eda6f128144 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_alloc.c,v 1.42 2002/06/23 03:07:22 deraadt Exp $ */
+/* $OpenBSD: ffs_alloc.c,v 1.43 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $ */
/*
@@ -167,11 +167,11 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp, blknop)
int osize, nsize;
struct ucred *cred;
struct buf **bpp;
- ufs_daddr_t *blknop;
+ daddr_t *blknop;
{
register struct fs *fs;
struct buf *bp = NULL;
- ufs_daddr_t quota_updated = 0;
+ daddr_t quota_updated = 0;
int cg, request, error;
daddr_t bprev, bno;
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index daf5b86082b..0993805aeed 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_balloc.c,v 1.22 2001/12/19 08:58:07 art Exp $ */
+/* $OpenBSD: ffs_balloc.c,v 1.23 2003/05/26 18:33:16 tedu Exp $ */
/* $NetBSD: ffs_balloc.c,v 1.3 1996/02/09 22:22:21 christos Exp $ */
/*
@@ -382,7 +382,7 @@ fail:
(int)fs->fs_bsize, NOCRED, &bp);
if (r)
panic("Could not unwind indirect block, error %d", r);
- bap = (ufs_daddr_t *)bp->b_data;
+ bap = (daddr_t *)bp->b_data;
bap[indirs[unwindidx].in_off] = 0;
if (flags & B_SYNC) {
bwrite(bp);
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 4f4418f36bc..2fc5cbc4892 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_extern.h,v 1.19 2002/03/14 01:27:14 millert Exp $ */
+/* $OpenBSD: ffs_extern.h,v 1.20 2003/05/26 18:33:17 tedu Exp $ */
/* $NetBSD: ffs_extern.h,v 1.4 1996/02/09 22:22:22 christos Exp $ */
/*-
@@ -172,13 +172,13 @@ void softdep_load_inodeblock(struct inode *);
void softdep_freefile(struct vnode *, ino_t, int);
void softdep_setup_freeblocks(struct inode *, off_t);
void softdep_setup_inomapdep(struct buf *, struct inode *, ino_t);
-void softdep_setup_blkmapdep(struct buf *, struct fs *, ufs_daddr_t);
-void softdep_setup_allocdirect(struct inode *, ufs_lbn_t, ufs_daddr_t,
- ufs_daddr_t, long, long, struct buf *);
+void softdep_setup_blkmapdep(struct buf *, struct fs *, daddr_t);
+void softdep_setup_allocdirect(struct inode *, ufs_lbn_t, daddr_t,
+ daddr_t, long, long, struct buf *);
void softdep_setup_allocindir_meta(struct buf *, struct inode *,
- struct buf *, int, ufs_daddr_t);
+ struct buf *, int, daddr_t);
void softdep_setup_allocindir_page(struct inode *, ufs_lbn_t,
- struct buf *, int, ufs_daddr_t, ufs_daddr_t, struct buf *);
+ struct buf *, int, daddr_t, daddr_t, struct buf *);
void softdep_fsync_mountdev(struct vnode *);
int softdep_sync_metadata(struct vop_fsync_args *);
int softdep_fsync(struct vnode *vp);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 03532af425d..6ea4622b326 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_softdep.c,v 1.43 2003/05/14 01:12:27 jason Exp $ */
+/* $OpenBSD: ffs_softdep.c,v 1.44 2003/05/26 18:33:17 tedu Exp $ */
/*
* Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
*
@@ -134,7 +134,7 @@ STATIC struct dirrem *newdirrem(struct buf *, struct inode *,
struct inode *, int, struct dirrem **);
STATIC void free_diradd(struct diradd *);
STATIC void free_allocindir(struct allocindir *, struct inodedep *);
-STATIC int indir_trunc(struct inode *, ufs_daddr_t, int, ufs_lbn_t,
+STATIC int indir_trunc(struct inode *, daddr_t, int, ufs_lbn_t,
long *);
STATIC void deallocate_dependencies(struct buf *, struct inodedep *);
STATIC void free_allocdirect(struct allocdirectlst *,
@@ -145,14 +145,14 @@ STATIC void handle_workitem_freeblocks(struct freeblks *);
STATIC void merge_inode_lists(struct inodedep *);
STATIC void setup_allocindir_phase2(struct buf *, struct inode *,
struct allocindir *);
-STATIC struct allocindir *newallocindir(struct inode *, int, ufs_daddr_t,
- ufs_daddr_t);
+STATIC struct allocindir *newallocindir(struct inode *, int, daddr_t,
+ daddr_t);
STATIC void handle_workitem_freefrag(struct freefrag *);
-STATIC struct freefrag *newfreefrag(struct inode *, ufs_daddr_t, long);
+STATIC struct freefrag *newfreefrag(struct inode *, daddr_t, long);
STATIC void allocdirect_merge(struct allocdirectlst *,
struct allocdirect *, struct allocdirect *);
STATIC struct bmsafemap *bmsafemap_lookup(struct buf *);
-STATIC int newblk_lookup(struct fs *, ufs_daddr_t, int,
+STATIC int newblk_lookup(struct fs *, daddr_t, int,
struct newblk **);
STATIC int inodedep_lookup(struct fs *, ino_t, int, struct inodedep **);
STATIC int pagedep_lookup(struct inode *, ufs_lbn_t, int,
@@ -1109,7 +1109,7 @@ STATIC struct sema newblk_in_progress;
STATIC int
newblk_lookup(fs, newblkno, flags, newblkpp)
struct fs *fs;
- ufs_daddr_t newblkno;
+ daddr_t newblkno;
int flags;
struct newblk **newblkpp;
{
@@ -1317,7 +1317,7 @@ void
softdep_setup_blkmapdep(bp, fs, newblkno)
struct buf *bp; /* buffer for cylgroup block with block map */
struct fs *fs; /* filesystem doing allocation */
- ufs_daddr_t newblkno; /* number of newly allocated block */
+ daddr_t newblkno; /* number of newly allocated block */
{
struct newblk *newblk;
struct bmsafemap *bmsafemap;
@@ -1402,8 +1402,8 @@ void
softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
struct inode *ip; /* inode to which block is being added */
ufs_lbn_t lbn; /* block pointer within inode */
- ufs_daddr_t newblkno; /* disk block number being added */
- ufs_daddr_t oldblkno; /* previous block number, 0 unless frag */
+ daddr_t newblkno; /* disk block number being added */
+ daddr_t oldblkno; /* previous block number, 0 unless frag */
long newsize; /* size of new block */
long oldsize; /* size of new block */
struct buf *bp; /* bp for allocated block */
@@ -1566,7 +1566,7 @@ allocdirect_merge(adphead, newadp, oldadp)
STATIC struct freefrag *
newfreefrag(ip, blkno, size)
struct inode *ip;
- ufs_daddr_t blkno;
+ daddr_t blkno;
long size;
{
struct freefrag *freefrag;
@@ -1640,8 +1640,8 @@ STATIC struct allocindir *
newallocindir(ip, ptrno, newblkno, oldblkno)
struct inode *ip; /* inode for file being extended */
int ptrno; /* offset of pointer in indirect block */
- ufs_daddr_t newblkno; /* disk block number being added */
- ufs_daddr_t oldblkno; /* previous block number, 0 if none */
+ daddr_t newblkno; /* disk block number being added */
+ daddr_t oldblkno; /* previous block number, 0 if none */
{
struct allocindir *aip;
@@ -1666,8 +1666,8 @@ softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
ufs_lbn_t lbn; /* allocated block number within file */
struct buf *bp; /* buffer with indirect blk referencing page */
int ptrno; /* offset of pointer in indirect block */
- ufs_daddr_t newblkno; /* disk block number being added */
- ufs_daddr_t oldblkno; /* previous block number, 0 if none */
+ daddr_t newblkno; /* disk block number being added */
+ daddr_t oldblkno; /* previous block number, 0 if none */
struct buf *nbp; /* buffer holding allocated page */
{
struct allocindir *aip;
@@ -1704,7 +1704,7 @@ softdep_setup_allocindir_meta(nbp, ip, bp, ptrno, newblkno)
struct inode *ip; /* inode for file being extended */
struct buf *bp; /* indirect block referencing allocated block */
int ptrno; /* offset of pointer in indirect block */
- ufs_daddr_t newblkno; /* disk block number being added */
+ daddr_t newblkno; /* disk block number being added */
{
struct allocindir *aip;
@@ -1791,7 +1791,7 @@ setup_allocindir_phase2(bp, ip, aip)
free_allocindir(oldaip, NULL);
}
LIST_INSERT_HEAD(&indirdep->ir_deplisthd, aip, ai_next);
- ((ufs_daddr_t *)indirdep->ir_savebp->b_data)
+ ((daddr_t *)indirdep->ir_savebp->b_data)
[aip->ai_offset] = aip->ai_oldblkno;
FREE_LOCK(&lk);
if (freefrag != NULL)
@@ -2224,7 +2224,7 @@ handle_workitem_freeblocks(freeblks)
struct freeblks *freeblks;
{
struct inode tip;
- ufs_daddr_t bn;
+ daddr_t bn;
struct fs *fs;
int i, level, bsize;
long nblocks, blocksreleased = 0;
@@ -2287,14 +2287,14 @@ handle_workitem_freeblocks(freeblks)
STATIC int
indir_trunc(ip, dbn, level, lbn, countp)
struct inode *ip;
- ufs_daddr_t dbn;
+ daddr_t dbn;
int level;
ufs_lbn_t lbn;
long *countp;
{
struct buf *bp;
- ufs_daddr_t *bap;
- ufs_daddr_t nb;
+ daddr_t *bap;
+ daddr_t nb;
struct fs *fs;
struct worklist *wk;
struct indirdep *indirdep;
@@ -2342,7 +2342,7 @@ indir_trunc(ip, dbn, level, lbn, countp)
/*
* Recursively free indirect blocks.
*/
- bap = (ufs_daddr_t *)bp->b_data;
+ bap = (daddr_t *)bp->b_data;
nblocks = btodb(fs->fs_bsize);
for (i = NINDIR(fs) - 1; i >= 0; i--) {
if ((nb = bap[i]) == 0)
@@ -3549,7 +3549,7 @@ handle_allocindir_partdone(aip)
LIST_INSERT_HEAD(&indirdep->ir_donehd, aip, ai_next);
return;
}
- ((ufs_daddr_t *)indirdep->ir_savebp->b_data)[aip->ai_offset] =
+ ((daddr_t *)indirdep->ir_savebp->b_data)[aip->ai_offset] =
aip->ai_newblkno;
LIST_REMOVE(aip, ai_next);
if (aip->ai_freefrag != NULL)
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index fb29626b96e..2ee00be2b2d 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_softdep_stub.c,v 1.4 2002/02/22 20:37:46 drahn Exp $ */
+/* $OpenBSD: ffs_softdep_stub.c,v 1.5 2003/05/26 18:33:17 tedu Exp $ */
/*
* Copyright 1998 Marshall Kirk McKusick. All Rights Reserved.
@@ -89,7 +89,7 @@ void
softdep_setup_blkmapdep(bp, fs, newblkno)
struct buf *bp;
struct fs *fs;
- ufs_daddr_t newblkno;
+ daddr_t newblkno;
{
panic("softdep_setup_blkmapdep called");
@@ -99,8 +99,8 @@ void
softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
struct inode *ip;
ufs_lbn_t lbn;
- ufs_daddr_t newblkno;
- ufs_daddr_t oldblkno;
+ daddr_t newblkno;
+ daddr_t oldblkno;
long newsize;
long oldsize;
struct buf *bp;
@@ -115,8 +115,8 @@ softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
ufs_lbn_t lbn;
struct buf *bp;
int ptrno;
- ufs_daddr_t newblkno;
- ufs_daddr_t oldblkno;
+ daddr_t newblkno;
+ daddr_t oldblkno;
struct buf *nbp;
{
@@ -129,7 +129,7 @@ softdep_setup_allocindir_meta(nbp, ip, bp, ptrno, newblkno)
struct inode *ip;
struct buf *bp;
int ptrno;
- ufs_daddr_t newblkno;
+ daddr_t newblkno;
{
panic("softdep_setup_allocindir_meta called");
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index 9b568184916..bd1e575e3a2 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softdep.h,v 1.4 2001/02/21 23:24:31 csapuntz Exp $ */
+/* $OpenBSD: softdep.h,v 1.5 2003/05/26 18:33:17 tedu Exp $ */
/*
* Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
*
@@ -260,7 +260,7 @@ struct inodedep {
struct newblk {
LIST_ENTRY(newblk) nb_hash; /* hashed lookup */
struct fs *nb_fs; /* associated filesystem */
- ufs_daddr_t nb_newblkno; /* allocated block number */
+ daddr_t nb_newblkno; /* allocated block number */
int nb_state; /* state of bitmap dependency */
LIST_ENTRY(newblk) nb_deps; /* bmsafemap's list of newblk's */
struct bmsafemap *nb_bmsafemap; /* associated bmsafemap */
@@ -307,8 +307,8 @@ struct allocdirect {
# define ad_state ad_list.wk_state /* block pointer state */
TAILQ_ENTRY(allocdirect) ad_next; /* inodedep's list of allocdirect's */
ufs_lbn_t ad_lbn; /* block within file */
- ufs_daddr_t ad_newblkno; /* new value of block pointer */
- ufs_daddr_t ad_oldblkno; /* old value of block pointer */
+ daddr_t ad_newblkno; /* new value of block pointer */
+ daddr_t ad_oldblkno; /* old value of block pointer */
long ad_newsize; /* size of new block */
long ad_oldsize; /* size of old block */
LIST_ENTRY(allocdirect) ad_deps; /* bmsafemap's list of allocdirect's */
@@ -361,8 +361,8 @@ struct allocindir {
# define ai_state ai_list.wk_state /* indirect block pointer state */
LIST_ENTRY(allocindir) ai_next; /* indirdep's list of allocindir's */
int ai_offset; /* pointer offset in indirect block */
- ufs_daddr_t ai_newblkno; /* new block pointer value */
- ufs_daddr_t ai_oldblkno; /* old block pointer value */
+ daddr_t ai_newblkno; /* new block pointer value */
+ daddr_t ai_oldblkno; /* old block pointer value */
struct freefrag *ai_freefrag; /* block to be freed when complete */
struct indirdep *ai_indirdep; /* address of associated indirdep */
LIST_ENTRY(allocindir) ai_deps; /* bmsafemap's list of allocindir's */
@@ -384,7 +384,7 @@ struct freefrag {
# define ff_state ff_list.wk_state /* owning user; should be uid_t */
struct vnode *ff_devvp; /* filesystem device vnode */
struct mount *ff_mnt; /* associated mount point */
- ufs_daddr_t ff_blkno; /* fragment physical block number */
+ daddr_t ff_blkno; /* fragment physical block number */
long ff_fragsize; /* size of fragment being deleted */
ino_t ff_inum; /* owning inode number */
};
@@ -404,8 +404,8 @@ struct freeblks {
off_t fb_newsize; /* new file size */
int fb_chkcnt; /* used to check cnt of blks released */
uid_t fb_uid; /* uid of previous owner of blocks */
- ufs_daddr_t fb_dblks[NDADDR]; /* direct blk ptrs to deallocate */
- ufs_daddr_t fb_iblks[NIADDR]; /* indirect blk ptrs to deallocate */
+ daddr_t fb_dblks[NDADDR]; /* direct blk ptrs to deallocate */
+ daddr_t fb_iblks[NIADDR]; /* indirect blk ptrs to deallocate */
};
/*
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index b34fa3e0699..148c135c375 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dinode.h,v 1.5 1999/12/02 18:38:17 art Exp $ */
+/* $OpenBSD: dinode.h,v 1.6 2003/05/26 18:33:17 tedu Exp $ */
/* $NetBSD: dinode.h,v 1.7 1995/06/15 23:22:48 cgd Exp $ */
/*
@@ -68,6 +68,7 @@
*/
typedef int32_t ufs_daddr_t;
+typedef int32_t ufs1_daddr_t;
#define NDADDR 12 /* Direct addresses in inode. */
#define NIADDR 3 /* Indirect addresses in inode. */
@@ -85,8 +86,8 @@ struct dinode {
int32_t di_mtimensec; /* 28: Last modified time. */
int32_t di_ctime; /* 32: Last inode change time. */
int32_t di_ctimensec; /* 36: Last inode change time. */
- ufs_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */
- ufs_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */
+ ufs1_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */
+ ufs1_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */
u_int32_t di_flags; /* 100: Status flags (chflags). */
int32_t di_blocks; /* 104: Blocks actually held. */
int32_t di_gen; /* 108: Generation number. */
@@ -107,7 +108,7 @@ struct dinode {
#define di_ouid di_u.oldids[0]
#define di_rdev di_db[0]
#define di_shortlink di_db
-#define MAXSYMLINKLEN ((NDADDR + NIADDR) * sizeof(ufs_daddr_t))
+#define MAXSYMLINKLEN ((NDADDR + NIADDR) * sizeof(ufs1_daddr_t))
/* File permissions. */
#define IEXEC 0000100 /* Executable. */
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 4f48d2171d9..6ea07d5972c 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: inode.h,v 1.20 2002/06/06 20:57:47 aaron Exp $ */
+/* $OpenBSD: inode.h,v 1.21 2003/05/26 18:33:17 tedu Exp $ */
/* $NetBSD: inode.h,v 1.8 1995/06/15 23:22:50 cgd Exp $ */
/*
@@ -52,8 +52,8 @@ typedef long ufs_lbn_t;
* Per-filesystem inode extensions.
*/
struct ext2fs_inode_ext {
- ufs_daddr_t ext2fs_last_lblk; /* last logical block allocated */
- ufs_daddr_t ext2fs_last_blk; /* last block allocated on disk */
+ ufs1_daddr_t ext2fs_last_lblk; /* last logical block allocated */
+ ufs1_daddr_t ext2fs_last_blk; /* last block allocated on disk */
};
/*
@@ -235,7 +235,7 @@ struct inode_vtbl {
* ufs_getlbns and used by truncate and bmap code.
*/
struct indir {
- ufs_daddr_t in_lbn; /* Logical block number. */
+ daddr_t in_lbn; /* Logical block number. */
int in_off; /* Offset in buffer. */
int in_exists; /* Flag if the block exists. */
};
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 6b4bb97319b..355203f5014 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_bmap.c,v 1.14 2002/10/13 18:26:13 krw Exp $ */
+/* $OpenBSD: ufs_bmap.c,v 1.15 2003/05/26 18:33:17 tedu Exp $ */
/* $NetBSD: ufs_bmap.c,v 1.3 1996/02/09 22:36:00 christos Exp $ */
/*
@@ -103,8 +103,8 @@ ufs_bmap(v)
int
ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
struct vnode *vp;
- ufs_daddr_t bn;
- ufs_daddr_t *bnp;
+ daddr_t bn;
+ daddr_t *bnp;
struct indir *ap;
int *nump;
int *runp;
@@ -115,7 +115,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
struct mount *mp;
struct vnode *devvp;
struct indir a[NIADDR+1], *xap;
- ufs_daddr_t daddr;
+ daddr_t daddr;
long metalbn;
int error, maxrun = 0, num;
@@ -198,13 +198,13 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
}
}
- daddr = ((ufs_daddr_t *)bp->b_data)[xap->in_off];
+ daddr = ((daddr_t *)bp->b_data)[xap->in_off];
if (num == 1 && daddr && runp)
for (bn = xap->in_off + 1;
bn < MNINDIR(ump) && *runp < maxrun &&
is_sequential(ump,
- ((ufs_daddr_t *)bp->b_data)[bn - 1],
- ((ufs_daddr_t *)bp->b_data)[bn]);
+ ((daddr_t *)bp->b_data)[bn - 1],
+ ((daddr_t *)bp->b_data)[bn]);
++bn, ++*runp);
}
if (bp)
@@ -227,7 +227,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
int
ufs_getlbns(vp, bn, ap, nump)
struct vnode *vp;
- ufs_daddr_t bn;
+ daddr_t bn;
struct indir *ap;
int *nump;
{
diff --git a/sys/ufs/ufs/ufs_quota_stub.c b/sys/ufs/ufs/ufs_quota_stub.c
index 08631a1d2cd..accdd9d56f3 100644
--- a/sys/ufs/ufs/ufs_quota_stub.c
+++ b/sys/ufs/ufs/ufs_quota_stub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_quota_stub.c,v 1.2 2002/02/22 20:51:24 drahn Exp $ */
+/* $OpenBSD: ufs_quota_stub.c,v 1.3 2003/05/26 18:33:17 tedu Exp $ */
#include <sys/param.h>
#include <sys/kernel.h>
@@ -24,13 +24,13 @@ getinoquota(struct inode *ip) {
}
int
-ufs_quota_alloc_blocks2(struct inode *ip, ufs_daddr_t change,
+ufs_quota_alloc_blocks2(struct inode *ip, daddr_t change,
struct ucred *cred, enum ufs_quota_flags flags) {
return (0);
}
int
-ufs_quota_free_blocks2(struct inode *ip, ufs_daddr_t change,
+ufs_quota_free_blocks2(struct inode *ip, daddr_t change,
struct ucred *cred, enum ufs_quota_flags flags) {
return (0);
}
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 9da31e80924..a1b97032c5f 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_vnops.c,v 1.45 2002/05/23 12:46:42 art Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.46 2003/05/26 18:33:17 tedu Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -490,7 +490,7 @@ ufs_chown(vp, uid, gid, cred, p)
uid_t ouid;
gid_t ogid;
int error = 0;
- ufs_daddr_t change;
+ daddr_t change;
enum ufs_quota_flags quota_flags = 0;
if (uid == (uid_t)VNOVAL)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-31 23:38:38 +0000