[src/trunk]: src/sys/ufs/lfs Revert previous; it is wrong.

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

details:   https://anonhg.NetBSD.org/src/rev/754277783aaf
branches:  trunk
changeset: 788928:754277783aaf
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jul 29 16:39:37 2013 +0000

description:
Revert previous; it is wrong.

diffstat:

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

diffs (100 lines):

diff -r f12b227362f7 -r 754277783aaf sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Mon Jul 29 14:34:59 2013 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Mon Jul 29 16:39:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.255 2013/07/28 04:24:44 pgoyette Exp $ */
+/*     $NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 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.255 2013/07/28 04:24:44 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -620,6 +620,7 @@
        ip->i_flag |= IN_ACCESS | IN_CHANGE | IN_UPDATE;
        if (vap->va_rdev != VNOVAL) {
                struct ulfsmount *ump = ip->i_ump;
+               struct lfs *fs = ip->i_lfs;
                /*
                 * Want to be able to use this to make badblock
                 * inodes, so don't truncate the dev number.
diff -r f12b227362f7 -r 754277783aaf sys/ufs/lfs/ulfs_quota2.c
--- a/sys/ufs/lfs/ulfs_quota2.c Mon Jul 29 14:34:59 2013 +0000
+++ b/sys/ufs/lfs/ulfs_quota2.c Mon Jul 29 16:39:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_quota2.c,v 1.11 2013/07/28 04:49:03 pgoyette Exp $        */
+/*     $NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 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.11 2013/07/28 04:49:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $");
 
 #include <sys/buf.h>
 #include <sys/param.h>
@@ -305,6 +305,7 @@
        struct quota2_entry *q2e;
        daddr_t offset;
        u_long hash_mask;
+       struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
 
        KASSERT(mutex_owned(&dq->dq_interlock));
@@ -451,6 +452,7 @@
        struct dquot *dq;
        uint64_t ncurblks;
        struct ulfsmount *ump = ip->i_ump;
+       struct lfs *fs = ip->i_lfs;
        struct mount *mp = ump->um_mountp;
        const int needswap = ULFS_MPNEEDSWAP(fs);
        int i;
@@ -588,6 +590,7 @@
        struct quota2_header *q2h;
        struct quota2_entry q2e, *q2ep;
        struct buf *bp;
+       struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
 
        /* make sure we can index by the fs-independent idtype */
@@ -792,6 +795,7 @@
        int error;
        struct quota2_entry *q2ep;
        struct buf *bp;
+       struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
 
        error = lfs_dqget(NULLVP, qk->qk_id, ump, qk->qk_idtype, &dq);
@@ -827,6 +831,7 @@
        int error;
        struct quota2_entry *q2ep, q2e;
        struct buf  *bp;
+       struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
        id_t id2;
 
@@ -865,6 +870,7 @@
        struct quota2_header *q2h;
        struct quota2_entry q2e;
        struct buf *bp;
+       struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
        id_t id2;
 
@@ -1119,6 +1125,7 @@
     struct q2cursor_state *state,
     int *hashsize_ret, struct quota2_entry *default_q2e_ret)
 {
+       struct lfs *fs = ump->um_lfs;
        const int needswap = ULFS_MPNEEDSWAP(fs);
        struct buf *hbp;
        struct quota2_header *q2h;