[src/trunk]: src blkoff() -> ffs_blkoff() stragglers

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a5c842ddd65b
branches:  trunk
changeset: 787467:a5c842ddd65b
user:      dholland <dholland%NetBSD.org@localhost>
date:      Wed Jun 19 18:02:21 2013 +0000

description:
blkoff() -> ffs_blkoff() stragglers

diffstat:

 sbin/fsck_ffs/pass1.c   |  6 +++---
 sys/ufs/ffs/ffs_alloc.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 5aed7a1e9218 -r a5c842ddd65b sbin/fsck_ffs/pass1.c
--- a/sbin/fsck_ffs/pass1.c     Wed Jun 19 17:51:25 2013 +0000
+++ b/sbin/fsck_ffs/pass1.c     Wed Jun 19 18:02:21 2013 +0000
@@ -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 @@
                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
diff -r 5aed7a1e9218 -r a5c842ddd65b sys/ufs/ffs/ffs_alloc.c
--- a/sys/ufs/ffs/ffs_alloc.c   Wed Jun 19 17:51:25 2013 +0000
+++ b/sys/ufs/ffs/ffs_alloc.c   Wed Jun 19 18:02:21 2013 +0000
@@ -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 @@
                        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;