Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blkoff() -> ffs_blkoff() stragglers

This commit is contained in:
dholland 2013-06-19 18:02:21 +00:00
parent f1333577b5
commit de893df3a9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/fsck_ffs/pass1.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pass1.c,v 1.52 2013/06/19 17:51:25 dholland Exp $ */
/* $NetBSD: pass1.c,v 1.53 2013/06/19 18:02:21 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: pass1.c,v 1.52 2013/06/19 17:51:25 dholland Exp $");
__RCSID("$NetBSD: pass1.c,v 1.53 2013/06/19 18:02:21 dholland Exp $");
#endif
#endif /* not lint */
@ -431,7 +431,7 @@ checkinode(ino_t inumber, struct inodesc *idesc)
ndb = howmany(iswap32(dp->dp2.di_extsize), sblock->fs_bsize);
for (j = 0; j < UFS_NXADDR; j++) {
if (--ndb == 0 &&
(offset = blkoff(sblock, iswap32(dp->dp2.di_extsize))) != 0)
(offset = ffs_blkoff(sblock, iswap32(dp->dp2.di_extsize))) != 0)
idesc->id_numfrags = numfrags(sblock,
fragroundup(sblock, offset));
else

6
sys/ufs/ffs/ffs_alloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_alloc.c,v 1.134 2013/06/19 17:51:26 dholland Exp $ */
/* $NetBSD: ffs_alloc.c,v 1.135 2013/06/19 18:02:21 dholland Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.134 2013/06/19 17:51:26 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.135 2013/06/19 18:02:21 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@ -217,7 +217,7 @@ ffs_alloc(struct inode *ip, daddr_t lbn, daddr_t bpref, int size, int flags,
pg = uvm_pagelookup(uobj, off);
KASSERT((pg == NULL && (vp->v_vflag & VV_MAPPED) == 0 &&
(size & PAGE_MASK) == 0 &&
blkoff(fs, size) == 0) ||
ffs_blkoff(fs, size) == 0) ||
(pg != NULL && pg->owner == curproc->p_pid &&
pg->lowner == curlwp->l_lid));
off += PAGE_SIZE;