 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_bio.c,v 1.130 2015/07/24 06:59:32 dholland Exp $	*/
+/*	$NetBSD: lfs_bio.c,v 1.131 2015/07/25 10:40:35 martin Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -50,27 +50,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)lfs_bio.c	8.10 (Berkeley) 6/10/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.130 2015/07/24 06:59:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.131 2015/07/25 10:40:35 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/resourcevar.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/kauth.h>
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfsmount.h>
 @@ -221,27 +221,27 @@ lfs_reserveavail(struct lfs *fs, struct
 	ASSERT_MAYBE_SEGLOCK(fs);
 	slept = 0;
 	mutex_enter(&lfs_lock);
 	cantwait = (VTOI(vp)->i_flag & IN_ADIROP) || fs->lfs_unlockvp == vp;
 	while (!cantwait && fsb > 0 &&
 	       !lfs_fits(fs, fsb + fs->lfs_ravail + fs->lfs_favail)) {
 		mutex_exit(&lfs_lock);
 		if (!slept) {
 			DLOG((DLOG_AVAIL, "lfs_reserve: waiting for %ld (bfree = %d,"
 			      " est_bfree = %d)\n",
 			      fsb + fs->lfs_ravail + fs->lfs_favail,
-			      fs->lfs_bfree, LFS_EST_BFREE(fs)));
+			      lfs_sb_getbfree(fs), LFS_EST_BFREE(fs)));
+		}
 		++slept;
 		/* Wake up the cleaner */
 		LFS_CLEANERINFO(cip, fs, bp);
 		LFS_SYNC_CLEANERINFO(cip, fs, bp, 0);
 		lfs_wakeup_cleaner(fs);
 		mutex_enter(&lfs_lock);
 		/* Cleaner might have run while we were reading, check again */
 		if (lfs_fits(fs, fsb + fs->lfs_ravail + fs->lfs_favail))
 			break;
 @@ -357,27 +357,27 @@ lfs_fits(struct lfs *fs, int fsb)
+{
 	int64_t needed;
 	ASSERT_NO_SEGLOCK(fs);
 	needed = fsb + lfs_btofsb(fs, lfs_sb_getsumsize(fs)) +
 		 ((howmany(lfs_sb_getuinodes(fs) + 1, LFS_INOPB(fs)) +
 		   lfs_sb_getsegtabsz(fs) +
 ) << (lfs_sb_getbshift(fs) - lfs_sb_getffshift(fs)));
 	if (needed >= lfs_sb_getavail(fs)) {
 #ifdef DEBUG
 		DLOG((DLOG_AVAIL, "lfs_fits: no fit: fsb = %ld, uinodes = %ld, "
 		      "needed = %jd, avail = %jd\n",
-		      (long)fsb, (long)fs->lfs_uinodes, (intmax_t)needed,
+		      (long)fsb, (long)lfs_sb_getuinodes(fs), (intmax_t)needed,
 		      (intmax_t)lfs_sb_getavail(fs)));
 #endif
 		return 0;
+	}
 	return 1;
+}
 int
 lfs_availwait(struct lfs *fs, int fsb)
+{
 	int error;
 	CLEANERINFO *cip;
 	struct buf *cbp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_debug.c,v 1.43 2013/06/18 18:18:58 christos Exp $	*/
+/*	$NetBSD: lfs_debug.c,v 1.44 2015/07/25 10:40:35 martin Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -50,27 +50,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)lfs_debug.c	8.1 (Berkeley) 6/11/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_debug.c,v 1.43 2013/06/18 18:18:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_debug.c,v 1.44 2015/07/25 10:40:35 martin Exp $");
 #ifdef DEBUG
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
 #include <ufs/lfs/ulfs_inode.h>
 @@ -119,82 +119,82 @@ lfs_dumplog(void)
 				lfs_log[i].line,
 				cp);
+		}
+}
 void
 lfs_dump_super(struct lfs *lfsp)
+{
 	int i;
 	printf("%s%x\t%s%x\t%s%d\t%s%d\n",
 	       "magic	 ", lfsp->lfs_magic,
 	       "version	 ", lfsp->lfs_version,
-	       "size	 ", lfsp->lfs_size,
+	       "size	 ", lfs_sb_getsize(lfsp),
-	       "ssize	 ", lfsp->lfs_ssize);
+	       "ssize	 ", lfs_sb_getssize(lfsp));
 	printf("%s%d\t%s%d\t%s%d\t%s%d\n",
-	       "dsize	 ", lfsp->lfs_dsize,
+	       "dsize	 ", lfs_sb_getdsize(lfsp),
-	       "bsize	 ", lfsp->lfs_bsize,
+	       "bsize	 ", lfs_sb_getbsize(lfsp),
-	       "fsize	 ", lfsp->lfs_fsize,
+	       "fsize	 ", lfs_sb_getfsize(lfsp),
-	       "frag	 ", lfsp->lfs_frag);
+	       "frag	 ", lfs_sb_getfrag(lfsp));
 	printf("%s%d\t%s%d\t%s%d\t%s%d\n",
-	       "minfree	 ", lfsp->lfs_minfree,
+	       "minfree	 ", lfs_sb_getminfree(lfsp),
-	       "inopb	 ", lfsp->lfs_inopb,
+	       "inopb	 ", lfs_sb_getinopb(lfsp),
-	       "ifpb	 ", lfsp->lfs_ifpb,
+	       "ifpb	 ", lfs_sb_getifpb(lfsp),
-	       "nindir	 ", lfsp->lfs_nindir);
+	       "nindir	 ", lfs_sb_getnindir(lfsp));
 	printf("%s%d\t%s%d\t%s%d\t%s%d\n",
-	       "nseg	 ", lfsp->lfs_nseg,
+	       "nseg	 ", lfs_sb_getnseg(lfsp),
-	       "nspf	 ", lfsp->lfs_nspf,
+	       "nspf	 ", lfs_sb_getnspf(lfsp),
-	       "cleansz	 ", lfsp->lfs_cleansz,
+	       "cleansz	 ", lfs_sb_getcleansz(lfsp),
-	       "segtabsz ", lfsp->lfs_segtabsz);
+	       "segtabsz ", lfs_sb_getsegtabsz(lfsp));
 	printf("%s%x\t%s%d\t%s%lx\t%s%d\n",
-	       "segmask	 ", lfsp->lfs_segmask,
+	       "segmask	 ", lfs_sb_getsegmask(lfsp),
-	       "segshift ", lfsp->lfs_segshift,
+	       "segshift ", lfs_sb_getsegshift(lfsp),
-	       "bmask	 ", (unsigned long)lfsp->lfs_bmask,
+	       "bmask	 ", (unsigned long)lfs_sb_getbmask(lfsp),
-	       "bshift	 ", lfsp->lfs_bshift);
+	       "bshift	 ", lfs_sb_getbshift(lfsp));
 	printf("%s%lu\t%s%d\t%s%lx\t%s%u\n",
-	       "ffmask	 ", (unsigned long)lfsp->lfs_ffmask,
+	       "ffmask	 ", (unsigned long)lfs_sb_getffmask(lfsp),
-	       "ffshift	 ", lfsp->lfs_ffshift,
+	       "ffshift	 ", lfs_sb_getffshift(lfsp),
-	       "fbmask	 ", (unsigned long)lfsp->lfs_fbmask,
+	       "fbmask	 ", (unsigned long)lfs_sb_getfbmask(lfsp),
-	       "fbshift	 ", lfsp->lfs_fbshift);
+	       "fbshift	 ", lfs_sb_getfbshift(lfsp));
 	printf("%s%d\t%s%d\t%s%x\t%s%qx\n",
-	       "sushift	 ", lfsp->lfs_sushift,
+	       "sushift	 ", lfs_sb_getsushift(lfsp),
-	       "fsbtodb	 ", lfsp->lfs_fsbtodb,
+	       "fsbtodb	 ", lfs_sb_getfsbtodb(lfsp),
-	       "cksum	 ", lfsp->lfs_cksum,
+	       "cksum	 ", lfs_sb_getcksum(lfsp),
-	       "maxfilesize ", (long long)lfsp->lfs_maxfilesize);
+	       "maxfilesize ", (long long)lfs_sb_getmaxfilesize(lfsp));
 	printf("Superblock disk addresses:");
 	for (i = 0; i < LFS_MAXNUMSB; i++)
-		printf(" %x", lfsp->lfs_sboffs[i]);
+		printf(" %x", lfs_sb_getsboff(lfsp, i));
 	printf("\n");
 	printf("Checkpoint Info\n");
 	printf("%s%d\t%s%x\t%s%d\n",
-	       "freehd	 ", lfsp->lfs_freehd,
+	       "freehd	 ", lfs_sb_getfreehd(lfsp),
-	       "idaddr	 ", lfsp->lfs_idaddr,
+	       "idaddr	 ", lfs_sb_getidaddr(lfsp),
-	       "ifile	 ", lfsp->lfs_ifile);
+	       "ifile	 ", lfs_sb_getifile(lfsp));
 	printf("%s%x\t%s%d\t%s%x\t%s%x\t%s%x\t%s%x\n",
-	       "bfree	 ", lfsp->lfs_bfree,
+	       "bfree	 ", lfs_sb_getbfree(lfsp),
-	       "nfiles	 ", lfsp->lfs_nfiles,
+	       "nfiles	 ", lfs_sb_getnfiles(lfsp),
-	       "lastseg	 ", lfsp->lfs_lastseg,
+	       "lastseg	 ", lfs_sb_getlastseg(lfsp),
-	       "nextseg	 ", lfsp->lfs_nextseg,
+	       "nextseg	 ", lfs_sb_getnextseg(lfsp),
-	       "curseg	 ", lfsp->lfs_curseg,
+	       "curseg	 ", lfs_sb_getcurseg(lfsp),
-	       "offset	 ", lfsp->lfs_offset);
+	       "offset	 ", lfs_sb_getoffset(lfsp));
-	printf("tstamp	 %llx\n", (long long)lfsp->lfs_tstamp);
+	printf("tstamp	 %llx\n", (long long)lfs_sb_gettstamp(lfsp));
+}
 void
 lfs_dump_dinode(struct ulfs1_dinode *dip)
+{
 	int i;
 	printf("%s%u\t%s%d\t%s%u\t%s%u\t%s%qu\t%s%d\n",
 	       "mode   ", dip->di_mode,
 	       "nlink  ", dip->di_nlink,
 	       "uid    ", dip->di_uid,
 	       "gid    ", dip->di_gid,
 	       "size   ", (long long)dip->di_size,
 @@ -222,58 +222,58 @@ lfs_check_segsum(struct lfs *fs, struct
 	if ((actual = 1) == 1)
 		return; /* XXXX not checking this anymore, really */
 	if (sp->sum_bytes_left >= FINFOSIZE
 	   && sp->fip->fi_nblocks > 512) {
 		printf("%s:%d: fi_nblocks = %d\n",file,line,sp->fip->fi_nblocks);
 #ifdef DDB
 		Debugger();
 #endif
+	}
 	if (sp->sum_bytes_left > 484) {
 		printf("%s:%d: bad value (%d = -%d) for sum_bytes_left\n",
-		       file, line, sp->sum_bytes_left, fs->lfs_sumsize-sp->sum_bytes_left);
+		       file, line, sp->sum_bytes_left, lfs_sb_getsumsize(fs)-sp->sum_bytes_left);
 		panic("too many bytes");
+	}
-	actual = fs->lfs_sumsize
+	actual = lfs_sb_getsumsize(fs)
 		/* amount taken up by FINFOs */
 		- ((char *)&(sp->fip->fi_blocks[sp->fip->fi_nblocks]) - (char *)(sp->segsum))
 			/* amount taken up by inode blocks */
 			- sizeof(int32_t)*((sp->ninodes+LFS_INOPB(fs)-1) / LFS_INOPB(fs));
 #if 0
 	if (actual - sp->sum_bytes_left < offset)
+	{
 		printf("%s:%d: offset changed %d -> %d\n", file, line,
 		       offset, actual-sp->sum_bytes_left);
 		offset = actual - sp->sum_bytes_left;
 		/* panic("byte mismatch"); */
+	}
 #endif
 #if 0
 	if (actual != sp->sum_bytes_left)
 		printf("%s:%d: warning: segsum miscalc at %d (-%d => %d)\n",
 		       file, line, sp->sum_bytes_left,
 		       fs->lfs_sumsize-sp->sum_bytes_left,
 		       actual);
 #endif
 	if (sp->sum_bytes_left > 0
-	   && ((char *)(sp->segsum))[fs->lfs_sumsize
+	   && ((char *)(sp->segsum))[lfs_sb_getsumsize(fs)
 				     - sizeof(int32_t) * ((sp->ninodes+LFS_INOPB(fs)-1) / LFS_INOPB(fs))
 				     - sp->sum_bytes_left] != '\0') {
 		printf("%s:%d: warning: segsum overwrite at %d (-%d => %d)\n",
 		       file, line, sp->sum_bytes_left,
-		       fs->lfs_sumsize-sp->sum_bytes_left,
+		       lfs_sb_getsumsize(fs)-sp->sum_bytes_left,
 		       actual);
 #ifdef DDB
 		Debugger();
 #endif
+	}
+}
 void
 lfs_check_bpp(struct lfs *fs, struct segment *sp, char *file, int line)
+{
 	daddr_t blkno;
 	struct buf **bpp;
 	struct vnode *devvp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_pages.c,v 1.3 2015/07/24 06:59:32 dholland Exp $	*/
+/*	$NetBSD: lfs_pages.c,v 1.4 2015/07/25 10:40:35 martin Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -50,27 +50,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)lfs_vnops.c	8.13 (Berkeley) 6/10/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.3 2015/07/24 06:59:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.4 2015/07/25 10:40:35 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_uvm_page_trkown.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 @@ -774,43 +774,43 @@ lfs_putpages(void *v)
+		}
 		busypg = NULL;
 		KASSERT(!mutex_owned(&uvm_pageqlock));
 		oreclaim = (ap->a_flags & PGO_RECLAIM);
 		ap->a_flags &= ~PGO_RECLAIM;
 		error = genfs_do_putpages(vp, startoffset, endoffset,
 					   ap->a_flags, &busypg);
 		ap->a_flags |= oreclaim;
 		if (error == EDEADLK || error == EAGAIN) {
 			DLOG((DLOG_PAGE, "lfs_putpages: genfs_putpages returned"
 			      " %d ino %d off %x (seg %d)\n", error,
-			      ip->i_number, fs->lfs_offset,
+			      ip->i_number, lfs_sb_getoffset(fs),
-			      lfs_dtosn(fs, fs->lfs_offset)));
+			      lfs_dtosn(fs, lfs_sb_getoffset(fs))));
 			if (oreclaim) {
 				mutex_enter(vp->v_interlock);
 				write_and_wait(fs, vp, busypg, seglocked, "again");
 				mutex_exit(vp->v_interlock);
 			} else {
 				if ((sp->seg_flags & SEGM_SINGLE) &&
 				    lfs_sb_getcurseg(fs) != fs->lfs_startseg)
 					donewriting = 1;
+			}
 		} else if (error) {
 			DLOG((DLOG_PAGE, "lfs_putpages: genfs_putpages returned"
 			      " %d ino %d off %x (seg %d)\n", error,
-			      (int)ip->i_number, fs->lfs_offset,
+			      (int)ip->i_number, lfs_sb_getoffset(fs),
-			      lfs_dtosn(fs, fs->lfs_offset)));
+			      lfs_dtosn(fs, lfs_sb_getoffset(fs))));
+		}
 		/* genfs_do_putpages loses the interlock */
 #ifdef DEBUG
 		++debug_n_again;
 #endif
 		if (oreclaim && error == EAGAIN) {
 			DLOG((DLOG_PAGE, "vp %p ino %d vi_flags %x a_flags %x avoiding vclean panic\n",
 			      vp, (int)ip->i_number, vp->v_iflag, ap->a_flags));
 			mutex_enter(vp->v_interlock);
+		}
 		if (error == EDEADLK)
 			mutex_enter(vp->v_interlock);
 	} while (error == EDEADLK || (oreclaim && error == EAGAIN));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_segment.c,v 1.243 2015/07/24 06:59:32 dholland Exp $	*/
+/*	$NetBSD: lfs_segment.c,v 1.244 2015/07/25 10:40:35 martin Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -50,27 +50,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)lfs_segment.c	8.10 (Berkeley) 6/10/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.243 2015/07/24 06:59:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.244 2015/07/25 10:40:35 martin Exp $");
 #define _VFS_VNODE_PRIVATE	/* XXX: check for VI_MARKER, this has to go */
 #ifdef DEBUG
 # define vndebug(vp, str) do {						\
 	if (VTOI(vp)->i_flag & IN_CLEANING)				\
 		DLOG((DLOG_WVNODE, "not writing ino %d because %s (op %d)\n", \
 		     VTOI(vp)->i_number, (str), op));			\
 } while(0)
 #else
 # define vndebug(vp, str)
 #endif
 #define ivndebug(vp, str) \
 @@ -2237,27 +2237,27 @@ lfs_writeseg(struct lfs *fs, struct segm
 	for (bpp = sp->bpp, i = nblocks; i;) {
 		cbp = lfs_newclusterbuf(fs, devvp, (*bpp)->b_blkno, i);
 		cl = cbp->b_private;
 		cbp->b_flags |= B_ASYNC;
 		cbp->b_cflags |= BC_BUSY;
 		cbp->b_bcount = 0;
 #if defined(DEBUG) && defined(DIAGNOSTIC)
 		if (bpp - sp->bpp > (lfs_sb_getsumsize(fs) - SEGSUM_SIZE(fs))
 		    / sizeof(int32_t)) {
 			panic("lfs_writeseg: real bpp overwrite");
+		}
-		if (bpp - sp->bpp > lfs_segsize(fs) / fs->lfs_fsize) {
+		if (bpp - sp->bpp > lfs_segsize(fs) / lfs_sb_getfsize(fs)) {
 			panic("lfs_writeseg: theoretical bpp overwrite");
+		}
 #endif
 		/*
 		 * Construct the cluster.
 		 */
 		mutex_enter(&lfs_lock);
 		++fs->lfs_iocount;
 		mutex_exit(&lfs_lock);
 		while (i && cbp->b_bcount < CHUNKSIZE) {
 			bp = *bpp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_vnops.c,v 1.275 2015/07/24 06:59:32 dholland Exp $	*/
+/*	$NetBSD: lfs_vnops.c,v 1.276 2015/07/25 10:40:35 martin Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -115,27 +115,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_vnops.c	8.28 (Berkeley) 7/31/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.275 2015/07/24 06:59:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.276 2015/07/25 10:40:35 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_uvm_page_trkown.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 @@ -1860,27 +1860,27 @@ segwait_common:
 		lfs_flush_dirops(fs);
 		LFS_CLEANERINFO(cip, fs, bp);
 		oclean = cip->clean;
 		LFS_SYNC_CLEANERINFO(cip, fs, bp, 1);
 		lfs_segwrite(ap->a_vp->v_mount, SEGM_FORCE_CKP);
 		fs->lfs_sp->seg_flags |= SEGM_PROT;
 		lfs_segunlock(fs);
 		lfs_writer_leave(fs);
 #ifdef DEBUG
 		LFS_CLEANERINFO(cip, fs, bp);
 		DLOG((DLOG_CLEAN, "lfs_fcntl: reclaim wrote %" PRId64
 		      " blocks, cleaned %" PRId32 " segments (activesb %d)\n",
-		      fs->lfs_offset - off, cip->clean - oclean,
+		      lfs_sb_getoffset(fs) - off, cip->clean - oclean,
 		      fs->lfs_activesb));
 		LFS_SYNC_CLEANERINFO(cip, fs, bp, 0);
 #else
 		__USE(oclean);
 		__USE(off);
 #endif
 		return 0;
 	    case LFCNIFILEFH_COMPAT:
 		/* Return the filehandle of the Ifile */
 		if ((error = kauth_authorize_system(l->l_cred,
 		    KAUTH_SYSTEM_FILEHANDLE, 0, NULL, NULL, NULL)) != 0)