Index: sys/ufs/ffs/ffs_alloc.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_alloc.c,v
retrieving revision 1.140
diff -p -r1.140 ffs_alloc.c
*** sys/ufs/ffs/ffs_alloc.c	30 Sep 2013 18:58:00 -0000	1.140
--- sys/ufs/ffs/ffs_alloc.c	18 Oct 2013 00:18:29 -0000
*************** ffs_alloccg(struct inode *ip, int cg, da
*** 1092,1100 ****
  	daddr_t blkno;
  	int error, frags, allocsiz, i;
  	u_int8_t *blksfree;
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	ump = ip->i_ump;
  
--- 1092,1098 ----
*************** ffs_alloccgblk(struct inode *ip, struct 
*** 1209,1217 ****
  	daddr_t blkno;
  	int32_t bno;
  	u_int8_t *blksfree;
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	ump = ip->i_ump;
  
--- 1207,1213 ----
*************** ffs_nodealloccg(struct inode *ip, int cg
*** 1290,1298 ****
  	int32_t initediblk;
  	daddr_t nalloc;
  	struct ufs2_dinode *dp2;
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	KASSERT(mutex_owned(&ump->um_lock));
  	UFS_WAPBL_JLOCK_ASSERT(ip->i_ump->um_mountp);
--- 1286,1292 ----
*************** ffs_blkfree_cg(struct fs *fs, struct vno
*** 1562,1570 ****
  	int error, cg;
  	dev_t dev;
  	const bool devvp_is_snapshot = (devvp->v_type != VBLK);
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	KASSERT(!devvp_is_snapshot);
  
--- 1556,1562 ----
*************** ffs_blkfree_snap(struct fs *fs, struct v
*** 1834,1842 ****
  	int error, cg;
  	dev_t dev;
  	const bool devvp_is_snapshot = (devvp->v_type != VBLK);
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	KASSERT(devvp_is_snapshot);
  
--- 1826,1832 ----
*************** ffs_freefile(struct mount *mp, ino_t ino
*** 1997,2005 ****
  	int error, cg;
  	daddr_t cgbno;
  	dev_t dev;
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	cg = ino_to_cg(fs, ino);
  	devvp = ump->um_devvp;
--- 1987,1993 ----
*************** ffs_freefile_snap(struct fs *fs, struct 
*** 2036,2044 ****
  	int error, cg;
  	daddr_t cgbno;
  	dev_t dev;
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	KASSERT(devvp->v_type != VBLK);
  
--- 2024,2030 ----
*************** ffs_freefile_common(struct ufsmount *ump
*** 2074,2082 ****
  	int cg;
  	struct cg *cgp;
  	u_int8_t *inosused;
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	cg = ino_to_cg(fs, ino);
  	cgp = (struct cg *)bp->b_data;
--- 2060,2066 ----
*************** ffs_mapsearch(struct fs *fs, struct cg *
*** 2164,2172 ****
  	int blk, field, subfield, pos;
  	int ostart, olen;
  	u_int8_t *blksfree;
- #ifdef FFS_EI
  	const int needswap = UFS_FSNEEDSWAP(fs);
- #endif
  
  	/* KASSERT(mutex_owned(&ump->um_lock)); */
  
--- 2148,2154 ----
Index: sys/ufs/ffs/ffs_balloc.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_balloc.c,v
retrieving revision 1.59
diff -p -r1.59 ffs_balloc.c
*** sys/ufs/ffs/ffs_balloc.c	23 Jun 2013 07:28:37 -0000	1.59
--- sys/ufs/ffs/ffs_balloc.c	18 Oct 2013 00:18:29 -0000
*************** ffs_balloc_ufs1(struct vnode *vp, off_t 
*** 111,119 ****
  	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);
--- 111,117 ----
*************** ffs_balloc_ufs2(struct vnode *vp, off_t 
*** 528,536 ****
  	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);
--- 526,532 ----
Index: sys/ufs/ffs/ffs_inode.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_inode.c,v
retrieving revision 1.115
diff -p -r1.115 ffs_inode.c
*** sys/ufs/ffs/ffs_inode.c	23 Jun 2013 07:28:37 -0000	1.115
--- sys/ufs/ffs/ffs_inode.c	18 Oct 2013 00:18:29 -0000
*************** ffs_indirtrunc(struct inode *ip, daddr_t
*** 555,563 ****
  	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)					\
--- 555,561 ----
Index: sys/ufs/ffs/ffs_subr.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_subr.c,v
retrieving revision 1.47
diff -p -r1.47 ffs_subr.c
*** sys/ufs/ffs/ffs_subr.c	14 Aug 2011 12:37:09 -0000	1.47
--- sys/ufs/ffs/ffs_subr.c	18 Oct 2013 00:18:29 -0000
*************** ffs_clusteracct(struct fs *fs, struct cg
*** 286,294 ****
  	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)); */
  
--- 286,292 ----
Index: sys/ufs/ffs/ffs_wapbl.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_wapbl.c,v
retrieving revision 1.22
diff -p -r1.22 ffs_wapbl.c
*** sys/ufs/ffs/ffs_wapbl.c	23 Jun 2013 22:03:34 -0000	1.22
--- sys/ufs/ffs/ffs_wapbl.c	18 Oct 2013 00:18:29 -0000
*************** wapbl_find_log_start(struct mount *mp, s
*** 731,739 ****
  	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 */
--- 731,737 ----
Index: sys/ufs/ufs/ufs_bswap.h
===================================================================
RCS file: /cvsroot/src/sys/ufs/ufs/ufs_bswap.h,v
retrieving revision 1.19
diff -p -r1.19 ufs_bswap.h
*** sys/ufs/ufs/ufs_bswap.h	19 Oct 2009 18:41:17 -0000	1.19
--- sys/ufs/ufs/ufs_bswap.h	18 Oct 2013 00:18:29 -0000
*************** ufs_rw64(uint64_t a, int ns)
*** 65,73 ****
  	return ((ns) ? bswap64(a) : (a));
  }
  #else
! #define ufs_rw16(a, ns) ((uint16_t)(a))
! #define ufs_rw32(a, ns) ((uint32_t)(a))
! #define ufs_rw64(a, ns) ((uint64_t)(a))
  #endif
  
  #define ufs_add16(a, b, ns) \
--- 65,87 ----
  	return ((ns) ? bswap64(a) : (a));
  }
  #else
! static inline u_int16_t
! ufs_rw16(uint16_t a, int ns)
! {
! 	return a;
! }
! 
! static inline u_int32_t
! ufs_rw32(uint32_t a, int ns)
! {
! 	return a;
! }
! 
! static inline u_int64_t
! ufs_rw64(uint64_t a, int ns)
! {
! 	return a;
! }
  #endif
  
  #define ufs_add16(a, b, ns) \