From de893df3a9e9ab8f74da54b873f66a70b5db20bf Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Wed, 19 Jun 2013 18:02:21 +0000
Subject: [PATCH] blkoff() -> ffs_blkoff() stragglers

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

diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 52504e36b338..4653cc55f5c3 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -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
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 05683168b847..cb117de0e41f 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -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;