[src/trunk]: src/sys/ufs/lfs Fix build both with and without options LFS_EI.

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

details:   https://anonhg.NetBSD.org/src/rev/d5d3ff3e6467
branches:  trunk
changeset: 788929:d5d3ff3e6467
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jul 29 16:40:46 2013 +0000

description:
Fix build both with and without options LFS_EI.

diffstat:

 sys/ufs/lfs/lfs_vnops.c   |   5 +++--
 sys/ufs/lfs/ulfs_quota2.c |  18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diffs (107 lines):

diff -r 754277783aaf -r d5d3ff3e6467 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Mon Jul 29 16:39:37 2013 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Mon Jul 29 16:40:46 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $ */
+/*     $NetBSD: lfs_vnops.c,v 1.257 2013/07/29 16:40:46 dholland Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.257 2013/07/29 16:40:46 dholland Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -621,6 +621,7 @@
        if (vap->va_rdev != VNOVAL) {
                struct ulfsmount *ump = ip->i_ump;
                struct lfs *fs = ip->i_lfs;
+               (void)fs; /* temporary: needed when LFS_EI is off */
                /*
                 * Want to be able to use this to make badblock
                 * inodes, so don't truncate the dev number.
diff -r 754277783aaf -r d5d3ff3e6467 sys/ufs/lfs/ulfs_quota2.c
--- a/sys/ufs/lfs/ulfs_quota2.c Mon Jul 29 16:39:37 2013 +0000
+++ b/sys/ufs/lfs/ulfs_quota2.c Mon Jul 29 16:40:46 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $        */
+/*     $NetBSD: ulfs_quota2.c,v 1.13 2013/07/29 16:40:46 dholland Exp $        */
 /*  from NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp  */
 /*  from NetBSD: ffs_quota2.c,v 1.4 2011/06/12 03:36:00 rmind Exp  */
 
@@ -29,7 +29,7 @@
   */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.13 2013/07/29 16:40:46 dholland Exp $");
 
 #include <sys/buf.h>
 #include <sys/param.h>
@@ -308,6 +308,8 @@
        struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
 
+       (void)fs; /* temporary: needed when LFS_EI is off */
+
        KASSERT(mutex_owned(&dq->dq_interlock));
        KASSERT(mutex_owned(&lfs_dqlock));
        error = getq2h(ump, type, &hbp, &q2h, B_MODIFY);
@@ -457,6 +459,8 @@
        const int needswap = ULFS_MPNEEDSWAP(fs);
        int i;
 
+       (void)fs; /* temporary: needed when LFS_EI is off */
+
        if ((error = getinoquota2(ip, change > 0, change != 0, bp, q2e)) != 0)
                return error;
        if (change == 0) {
@@ -593,6 +597,8 @@
        struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
 
+       (void)fs; /* temporary: needed when LFS_EI is off */
+
        /* make sure we can index by the fs-independent idtype */
        CTASSERT(QUOTA_IDTYPE_USER == ULFS_USRQUOTA);
        CTASSERT(QUOTA_IDTYPE_GROUP == ULFS_GRPQUOTA);
@@ -798,6 +804,8 @@
        struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
 
+       (void)fs; /* temporary: needed when LFS_EI is off */
+
        error = lfs_dqget(NULLVP, qk->qk_id, ump, qk->qk_idtype, &dq);
        if (error)
                return error;
@@ -835,6 +843,8 @@
        const int needswap = ULFS_MPNEEDSWAP(fs);
        id_t id2;
 
+       (void)fs; /* temporary: needed when LFS_EI is off */
+
        error = lfs_dqget(NULLVP, qk->qk_id, ump, qk->qk_idtype, &dq);
        if (error)
                return error;
@@ -874,6 +884,8 @@
        const int needswap = ULFS_MPNEEDSWAP(fs);
        id_t id2;
 
+       (void)fs; /* temporary: needed when LFS_EI is off */
+
        /*
         * Make sure the FS-independent codes match the internal ones,
         * so we can use the passed-in objtype without having to
@@ -1134,6 +1146,8 @@
        uint64_t offset;
        int error;
 
+       (void)fs; /* temporary: needed when LFS_EI is off */
+
        /*
         * Read the header block.
         */