 @@ -1,14 +1,14 @@
-/*	$NetBSD: ext2fs_bswap.c,v 1.17 2012/11/18 17:59:56 jakllsch Exp $	*/
+/*	$NetBSD: ext2fs_bswap.c,v 1.18 2012/11/19 00:36:21 jakllsch Exp $	*/
 /*
  * Copyright (c) 1997 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_bswap.c,v 1.17 2012/11/18 17:59:56 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_bswap.c,v 1.18 2012/11/19 00:36:21 jakllsch Exp $");
 #include <sys/types.h>
 #include <ufs/ext2fs/ext2fs.h>
 #include <ufs/ext2fs/ext2fs_dinode.h>
 #if defined(_KERNEL)
 #include <sys/systm.h>
 #else
 #include <string.h>
 #endif
 /* These functions are only needed if native byte order is not little endian */
 #if BYTE_ORDER == BIG_ENDIAN
 @@ -99,23 +99,26 @@ void e2fs_i_bswap(struct ext2fs_dinode *
+{
 	new->e2di_mode		=	bswap16(old->e2di_mode);
 	new->e2di_uid		=	bswap16(old->e2di_uid);
 	new->e2di_gid		=	bswap16(old->e2di_gid);
 	new->e2di_nlink		=	bswap16(old->e2di_nlink);
 	new->e2di_size		=	bswap32(old->e2di_size);
 	new->e2di_atime		=	bswap32(old->e2di_atime);
 	new->e2di_ctime		=	bswap32(old->e2di_ctime);
 	new->e2di_mtime		=	bswap32(old->e2di_mtime);
 	new->e2di_dtime		=	bswap32(old->e2di_dtime);
 	new->e2di_nblock	=	bswap32(old->e2di_nblock);
 	new->e2di_flags		=	bswap32(old->e2di_flags);
 	new->e2di_version	=	bswap32(old->e2di_version);
 	new->e2di_gen		=	bswap32(old->e2di_gen);
 	new->e2di_facl		=	bswap32(old->e2di_facl);
 	new->e2di_dacl		=	bswap32(old->e2di_dacl);
 	new->e2di_faddr		=	bswap32(old->e2di_faddr);
 	new->e2di_nblock_high	=	bswap16(old->e2di_nblock_high);
 	new->e2di_facl_high	=	bswap16(old->e2di_facl_high);
 	new->e2di_uid_high	=	bswap16(old->e2di_uid_high);
 	new->e2di_gid_high	=	bswap16(old->e2di_gid_high);
 	memcpy(&new->e2di_blocks[0], &old->e2di_blocks[0],
 	    (NDADDR + NIADDR) * sizeof(uint32_t));
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ext2fs_dinode.h,v 1.23 2012/11/18 18:20:56 jakllsch Exp $	*/
+/*	$NetBSD: ext2fs_dinode.h,v 1.24 2012/11/19 00:36:21 jakllsch Exp $	*/
 /*
  * Copyright (c) 1982, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -99,35 +99,34 @@
 struct ext2fs_dinode {
 	uint16_t	e2di_mode;	/*   0: IFMT, permissions; see below. */
 	uint16_t	e2di_uid;	/*   2: Owner UID */
 	uint32_t	e2di_size;	/*   4: Size (in bytes) */
 	uint32_t	e2di_atime;	/*   8: Access time */
 	uint32_t	e2di_ctime;	/*  12: Create time */
 	uint32_t	e2di_mtime;	/*  16: Modification time */
 	uint32_t	e2di_dtime;	/*  20: Deletion time */
 	uint16_t	e2di_gid;	/*  24: Owner GID */
 	uint16_t	e2di_nlink;	/*  26: File link count */
 	uint32_t	e2di_nblock;	/*  28: Blocks count */
 	uint32_t	e2di_flags;	/*  32: Status flags (chflags) */
-	uint32_t	e2di_linux_reserved1; /* 36 */
+	uint32_t	e2di_version;	/*  36: was reserved1 */
 	uint32_t	e2di_blocks[NDADDR+NIADDR]; /* 40: disk blocks */
 	uint32_t	e2di_gen;	/* 100: generation number */
 	uint32_t	e2di_facl;	/* 104: file ACL (not implemented) */
 	uint32_t	e2di_dacl;	/* 108: dir ACL (not implemented) */
 	uint32_t	e2di_faddr;	/* 112: fragment address */
-	uint8_t		e2di_nfrag;	/* 116: fragment number */
+	uint16_t	e2di_nblock_high; /* 116: Blocks count bits 47:32 */
-	uint8_t		e2di_fsize;	/* 117: fragment size */
+	uint16_t	e2di_facl_high; /* 118: file ACL bits 47:32 */
 	uint16_t	e2di_linux_reserved2; /* 118 */
 	uint16_t	e2di_uid_high;	/* 120: Owner UID top 16 bits */
 	uint16_t	e2di_gid_high;	/* 122: Owner GID top 16 bits */
 	uint32_t	e2di_linux_reserved3; /* 124 */
 };
 #define	E2MAXSYMLINKLEN	((NDADDR + NIADDR) * sizeof(uint32_t))
 /* File permissions. */
 #define	EXT2_IEXEC		0000100		/* Executable. */
 #define	EXT2_IWRITE		0000200		/* Writable. */
 #define	EXT2_IREAD		0000400		/* Readable. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: inode.h,v 1.63 2012/11/19 00:25:29 jakllsch Exp $	*/
+/*	$NetBSD: inode.h,v 1.64 2012/11/19 00:36:21 jakllsch Exp $	*/
 /*
  * Copyright (c) 1982, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -210,34 +210,35 @@ struct inode {
 #define	i_ffs2_extb		i_din.ffs2_din->di_extb
 #define	i_e2fs_mode		i_din.e2fs_din->e2di_mode
 #define	i_e2fs_uid		i_din.e2fs_din->e2di_uid
 #define	i_e2fs_size		i_din.e2fs_din->e2di_size
 #define	i_e2fs_atime		i_din.e2fs_din->e2di_atime
 #define	i_e2fs_ctime		i_din.e2fs_din->e2di_ctime
 #define	i_e2fs_mtime		i_din.e2fs_din->e2di_mtime
 #define	i_e2fs_dtime		i_din.e2fs_din->e2di_dtime
 #define	i_e2fs_gid		i_din.e2fs_din->e2di_gid
 #define	i_e2fs_nlink		i_din.e2fs_din->e2di_nlink
 #define	i_e2fs_nblock		i_din.e2fs_din->e2di_nblock
 #define	i_e2fs_flags		i_din.e2fs_din->e2di_flags
 #define	i_e2fs_version		i_din.e2fs_din->e2di_version
 #define	i_e2fs_blocks		i_din.e2fs_din->e2di_blocks
 #define	i_e2fs_rdev		i_din.e2fs_din->e2di_rdev
 #define	i_e2fs_gen		i_din.e2fs_din->e2di_gen
 #define	i_e2fs_facl		i_din.e2fs_din->e2di_facl
 #define	i_e2fs_dacl		i_din.e2fs_din->e2di_dacl
 #define	i_e2fs_faddr		i_din.e2fs_din->e2di_faddr
-#define	i_e2fs_nfrag		i_din.e2fs_din->e2di_nfrag
+#define	i_e2fs_nblock_high	i_din.e2fs_din->e2di_nblock_high
-#define	i_e2fs_fsize		i_din.e2fs_din->e2di_fsize
+#define	i_e2fs_facl_high	i_din.e2fs_din->e2di_facl_high
 #define	i_e2fs_uid_high		i_din.e2fs_din->e2di_uid_high
 #define	i_e2fs_gid_high		i_din.e2fs_din->e2di_gid_high
 /* These flags are kept in i_flag. */
 #define	IN_ACCESS	0x0001		/* Access time update request. */
 #define	IN_CHANGE	0x0002		/* Inode change time update request. */
 #define	IN_UPDATE	0x0004		/* Inode was written to; update mtime. */
 #define	IN_MODIFY	0x2000		/* Modification time update request. */
 #define	IN_MODIFIED	0x0008		/* Inode has been modified. */
 #define	IN_ACCESSED	0x0010		/* Inode has been accessed. */
 /* #define	IN_UNUSED	0x0020 */	/* unused, was IN_RENAME */
 #define	IN_SHLOCK	0x0040		/* File has shared lock. */
 #define	IN_EXLOCK	0x0080		/* File has exclusive lock. */