[src/trunk]: src/sys/ufs Definining needswap where needed.

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

details:   https://anonhg.NetBSD.org/src/rev/ef74ad7dd9e5
branches:  trunk
changeset: 790743:ef74ad7dd9e5
user:      htodd <htodd%NetBSD.org@localhost>
date:      Sun Oct 20 00:29:10 2013 +0000

description:
Definining needswap where needed.

diffstat:

 sys/ufs/ffs/ffs_balloc.c |   8 ++------
 sys/ufs/ffs/ffs_inode.c  |   6 ++----
 sys/ufs/ffs/ffs_subr.c   |   6 ++----
 sys/ufs/ffs/ffs_wapbl.c  |   6 ++----
 sys/ufs/ufs/ufs_lookup.c |   6 ++----
 sys/ufs/ufs/ufs_quota2.c |  14 ++------------
 6 files changed, 12 insertions(+), 34 deletions(-)

diffs (218 lines):

diff -r c3ad2006d2bd -r ef74ad7dd9e5 sys/ufs/ffs/ffs_balloc.c
--- a/sys/ufs/ffs/ffs_balloc.c  Sun Oct 20 00:20:53 2013 +0000
+++ b/sys/ufs/ffs/ffs_balloc.c  Sun Oct 20 00:29:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_balloc.c,v 1.59 2013/06/23 07:28:37 dholland Exp $ */
+/*     $NetBSD: ffs_balloc.c,v 1.60 2013/10/20 00:29:10 htodd Exp $    */
 
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.59 2013/06/23 07:28:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.60 2013/10/20 00:29:10 htodd Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -111,9 +111,7 @@
        int32_t *blkp, *allocblk, allociblk[UFS_NIADDR + 1];
        int32_t *allocib;
        int unwindidx = -1;
-#ifdef FFS_EI
        const int needswap = UFS_FSNEEDSWAP(fs);
-#endif
        UVMHIST_FUNC("ffs_balloc"); UVMHIST_CALLED(ubchist);
 
        lbn = ffs_lblkno(fs, off);
@@ -528,9 +526,7 @@
        daddr_t *blkp, *allocblk, allociblk[UFS_NIADDR + 1];
        int64_t *allocib;
        int unwindidx = -1;
-#ifdef FFS_EI
        const int needswap = UFS_FSNEEDSWAP(fs);
-#endif
        UVMHIST_FUNC("ffs_balloc"); UVMHIST_CALLED(ubchist);
 
        lbn = ffs_lblkno(fs, off);
diff -r c3ad2006d2bd -r ef74ad7dd9e5 sys/ufs/ffs/ffs_inode.c
--- a/sys/ufs/ffs/ffs_inode.c   Sun Oct 20 00:20:53 2013 +0000
+++ b/sys/ufs/ffs/ffs_inode.c   Sun Oct 20 00:29:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_inode.c,v 1.115 2013/06/23 07:28:37 dholland Exp $ */
+/*     $NetBSD: ffs_inode.c,v 1.116 2013/10/20 00:29:10 htodd Exp $    */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.115 2013/06/23 07:28:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.116 2013/10/20 00:29:10 htodd Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -555,9 +555,7 @@
        int64_t blkcount, factor, blocksreleased = 0;
        int nblocks;
        int error = 0, allerror = 0;
-#ifdef FFS_EI
        const int needswap = UFS_FSNEEDSWAP(fs);
-#endif
 #define RBAP(ip, i) (((ip)->i_ump->um_fstype == UFS1) ? \
            ufs_rw32(bap1[i], needswap) : ufs_rw64(bap2[i], needswap))
 #define BAP_ASSIGN(ip, i, value)                                       \
diff -r c3ad2006d2bd -r ef74ad7dd9e5 sys/ufs/ffs/ffs_subr.c
--- a/sys/ufs/ffs/ffs_subr.c    Sun Oct 20 00:20:53 2013 +0000
+++ b/sys/ufs/ffs/ffs_subr.c    Sun Oct 20 00:29:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_subr.c,v 1.47 2011/08/14 12:37:09 christos Exp $   */
+/*     $NetBSD: ffs_subr.c,v 1.48 2013/10/20 00:29:10 htodd Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.47 2011/08/14 12:37:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.48 2013/10/20 00:29:10 htodd Exp $");
 
 #include <sys/param.h>
 
@@ -286,9 +286,7 @@
        int32_t *lp;
        u_char *freemapp, *mapp;
        int i, start, end, forw, back, map, bit;
-#ifdef FFS_EI
        const int needswap = UFS_FSNEEDSWAP(fs);
-#endif
 
        /* KASSERT(mutex_owned(&ump->um_lock)); */
 
diff -r c3ad2006d2bd -r ef74ad7dd9e5 sys/ufs/ffs/ffs_wapbl.c
--- a/sys/ufs/ffs/ffs_wapbl.c   Sun Oct 20 00:20:53 2013 +0000
+++ b/sys/ufs/ffs/ffs_wapbl.c   Sun Oct 20 00:29:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_wapbl.c,v 1.23 2013/10/19 19:29:59 martin Exp $    */
+/*     $NetBSD: ffs_wapbl.c,v 1.24 2013/10/20 00:29:10 htodd Exp $     */
 
 /*-
  * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.23 2013/10/19 19:29:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.24 2013/10/20 00:29:10 htodd Exp $");
 
 #define WAPBL_INTERNAL
 
@@ -731,9 +731,7 @@
        daddr_t desired_blks, min_desired_blks;
        daddr_t freeblks, best_blks;
        int bpcg, cg, error, fixedsize, indir_blks, n, s;
-#ifdef FFS_EI
        const int needswap = UFS_FSNEEDSWAP(fs);
-#endif
 
        if (logsize == 0) {
                fixedsize = 0;  /* We can adjust the size if tight */
diff -r c3ad2006d2bd -r ef74ad7dd9e5 sys/ufs/ufs/ufs_lookup.c
--- a/sys/ufs/ufs/ufs_lookup.c  Sun Oct 20 00:20:53 2013 +0000
+++ b/sys/ufs/ufs/ufs_lookup.c  Sun Oct 20 00:29:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_lookup.c,v 1.125 2013/09/15 15:08:09 martin Exp $  */
+/*     $NetBSD: ufs_lookup.c,v 1.126 2013/10/20 00:29:10 htodd Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.125 2013/09/15 15:08:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.126 2013/10/20 00:29:10 htodd Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ffs.h"
@@ -1068,9 +1068,7 @@
        struct direct *ep;
        struct buf *bp;
        int error;
-#ifdef FFS_EI
        const int needswap = UFS_MPNEEDSWAP(dp->i_ump);
-#endif
 
        UFS_WAPBL_JLOCK_ASSERT(dvp->v_mount);
 
diff -r c3ad2006d2bd -r ef74ad7dd9e5 sys/ufs/ufs/ufs_quota2.c
--- a/sys/ufs/ufs/ufs_quota2.c  Sun Oct 20 00:20:53 2013 +0000
+++ b/sys/ufs/ufs/ufs_quota2.c  Sun Oct 20 00:29:10 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.36 2013/10/20 00:29:10 htodd Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * All rights reserved.
@@ -26,7 +26,7 @@
   */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.36 2013/10/20 00:29:10 htodd Exp $");
 
 #include <sys/buf.h>
 #include <sys/param.h>
@@ -138,9 +138,7 @@
 getq2h(struct ufsmount *ump, int type,
     struct buf **bpp, struct quota2_header **q2hp, int flags)
 {
-#ifdef FFS_EI
        const int needswap = UFS_MPNEEDSWAP(ump);
-#endif
        int error;
        struct buf *bp;
        struct quota2_header *q2h;
@@ -194,9 +192,7 @@
     uint64_t *offp, int flags, void *a,
     int (*func)(struct ufsmount *, uint64_t *, struct quota2_entry *, uint64_t, void *))
 {
-#ifdef FFS_EI
        const int needswap = UFS_MPNEEDSWAP(ump);
-#endif
        daddr_t off = ufs_rw64(*offp, needswap);
        struct buf *bp, *obp = hbp;
        int ret = 0, ret2 = 0;
@@ -654,9 +650,7 @@
     uint64_t off, void *v)
 {
        struct dq2clear_callback *c = v;
-#ifdef FFS_EI
        const int needswap = UFS_MPNEEDSWAP(ump);
-#endif
        uint64_t myoff;
 
        if (ufs_rw32(q2e->q2e_uid, needswap) == c->id) {
@@ -1095,9 +1089,7 @@
 {
        struct q2cursor_getids *gi = v;
        id_t id;
-#ifdef FFS_EI
        const int needswap = UFS_MPNEEDSWAP(ump);
-#endif
 
        if (gi->skipped < gi->skip) {
                gi->skipped++;
@@ -1506,9 +1498,7 @@
        struct dq2get_callback *c = v;
        daddr_t lblkno;
        int blkoff;
-#ifdef FFS_EI
        const int needswap = UFS_MPNEEDSWAP(ump);
-#endif
 
        if (ufs_rw32(q2e->q2e_uid, needswap) == c->id) {
                KASSERT(mutex_owned(&c->dq->dq_interlock));