 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_accessors.h,v 1.42 2016/01/10 16:14:27 christos Exp $	*/
+/*	$NetBSD: lfs_accessors.h,v 1.43 2016/02/19 03:43:42 riastradh Exp $	*/
 /*  from NetBSD: lfs.h,v 1.165 2015/07/24 06:59:32 dholland Exp  */
 /*  from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp  */
 /*  from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland 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
 @@ -141,29 +141,34 @@
+ *
  *	@(#)dir.h	8.5 (Berkeley) 4/27/95
  */
 #ifndef _UFS_LFS_LFS_ACCESSORS_H_
 #define _UFS_LFS_LFS_ACCESSORS_H_
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
 #endif
 #include <sys/bswap.h>
 #include <ufs/lfs/lfs.h>
 #if !defined(_KERNEL) && !defined(_STANDALONE)
 #include <assert.h>
 #include <string.h>
 #define KASSERT assert
 #else
 #include <sys/systm.h>
 #endif
 /*
  * STRUCT_LFS is used by the libsa code to get accessors that work
  * with struct salfs instead of struct lfs, and by the cleaner to
  * get accessors that work with struct clfs.
  */
 #ifndef STRUCT_LFS
 #define STRUCT_LFS struct lfs
 #endif
 /*
 @@ -482,27 +487,27 @@ LFS_DEF_DINO_ACCESSOR(uint64_t, uint64_t
 LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, atime);
 LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, atimensec);
 LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, mtime);
 LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, mtimensec);
 LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, ctime);
 LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, ctimensec);
 LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, flags);
 LFS_DEF_DINO_ACCESSOR(uint64_t, uint32_t, blocks);
 LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, gen);
 LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, uid);
 LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, gid);
 /* XXX this should be done differently (it's a fake field) */
-LFS_DEF_DINO_ACCESSOR(uint64_t, int32_t, rdev);
+LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, rdev);
 static __inline daddr_t
 lfs_dino_getdb(STRUCT_LFS *fs, union lfs_dinode *dip, unsigned ix)
+{
 	KASSERT(ix < ULFS_NDADDR);
 	if (fs->lfs_is64) {
 		return LFS_SWAP_uint64_t(fs, dip->u_64.di_db[ix]);
 	} else {
 		/* note: this must sign-extend or UNWRITTEN gets trashed */
 		return (int32_t)LFS_SWAP_uint32_t(fs, dip->u_32.di_db[ix]);
+	}
+}
 @@ -732,50 +737,50 @@ lfs_iblock_set(STRUCT_LFS *fs, void *blo
 		} else {					\
 			type32 *p = &fip->u_32.fi_##field;	\
 			(void)p;				\
 			fip->u_32.fi_##field = val;		\
 		}						\
 	}							\
 LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, nblocks);
 LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, version);
 LFS_DEF_FI_ACCESSOR(uint64_t, uint32_t, ino);
 LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, lastlength);
 static __inline daddr_t
-lfs_fi_getblock(STRUCT_LFS *fs, FINFO *fip, unsigned index)
+lfs_fi_getblock(STRUCT_LFS *fs, FINFO *fip, unsigned idx)
+{
 	void *firstblock;
 	firstblock = (char *)fip + FINFOSIZE(fs);
-	KASSERT(index < lfs_fi_getnblocks(fs, fip));
+	KASSERT(idx < lfs_fi_getnblocks(fs, fip));
 	if (fs->lfs_is64) {
-		return ((int64_t *)firstblock)[index];
+		return ((int64_t *)firstblock)[idx];
 	} else {
-		return ((int32_t *)firstblock)[index];
+		return ((int32_t *)firstblock)[idx];
+	}
+}
 static __inline void
-lfs_fi_setblock(STRUCT_LFS *fs, FINFO *fip, unsigned index, daddr_t blk)
+lfs_fi_setblock(STRUCT_LFS *fs, FINFO *fip, unsigned idx, daddr_t blk)
+{
 	void *firstblock;
 	firstblock = (char *)fip + FINFOSIZE(fs);
-	KASSERT(index < lfs_fi_getnblocks(fs, fip));
+	KASSERT(idx < lfs_fi_getnblocks(fs, fip));
 	if (fs->lfs_is64) {
-		((int64_t *)firstblock)[index] = blk;
+		((int64_t *)firstblock)[idx] = blk;
 	} else {
-		((int32_t *)firstblock)[index] = blk;
+		((int32_t *)firstblock)[idx] = blk;
+	}
+}
 /*
  * inode info entries (in the segment summary)
  */
 #define IINFOSIZE(fs)	((fs)->lfs_is64 ? sizeof(IINFO64) : sizeof(IINFO32))
 /* iinfos scroll backward from the end of the segment summary block */
 #define SEGSUM_IINFOSTART(fs, buf) \
 	((IINFO *)((char *)buf + lfs_sb_getsumsize(fs) - IINFOSIZE(fs)))
 @@ -1402,42 +1407,42 @@ static __inline void
 lfs_blocks_fromfinfo(STRUCT_LFS *fs, union lfs_blocks *bp, FINFO *fip)
+{
 	void *firstblock;
 	firstblock = (char *)fip + FINFOSIZE(fs);
 	if (fs->lfs_is64) {
 		bp->b64 = (int64_t *)firstblock;
 	}  else {
 		bp->b32 = (int32_t *)firstblock;
+	}
+}
 static __inline daddr_t
-lfs_blocks_get(STRUCT_LFS *fs, union lfs_blocks *bp, unsigned index)
+lfs_blocks_get(STRUCT_LFS *fs, union lfs_blocks *bp, unsigned idx)
+{
 	if (fs->lfs_is64) {
-		return bp->b64[index];
+		return bp->b64[idx];
 	} else {
-		return bp->b32[index];
+		return bp->b32[idx];
+	}
+}
 static __inline void
-lfs_blocks_set(STRUCT_LFS *fs, union lfs_blocks *bp, unsigned index, daddr_t val)
+lfs_blocks_set(STRUCT_LFS *fs, union lfs_blocks *bp, unsigned idx, daddr_t val)
+{
 	if (fs->lfs_is64) {
-		bp->b64[index] = val;
+		bp->b64[idx] = val;
 	} else {
-		bp->b32[index] = val;
+		bp->b32[idx] = val;
+	}
+}
 static __inline void
 lfs_blocks_inc(STRUCT_LFS *fs, union lfs_blocks *bp)
+{
 	if (fs->lfs_is64) {
 		bp->b64++;
 	} else {
 		bp->b32++;
+	}
+}