[src/trunk]: src/sys/ufs/lfs Revert version 1.19 (make ufid_ino in struct ulf...

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

details:   https://anonhg.NetBSD.org/src/rev/f6e65f662906
branches:  trunk
changeset: 816200:f6e65f662906
user:      dholland <dholland%NetBSD.org@localhost>
date:      Tue Jun 21 06:14:40 2016 +0000

description:
Revert version 1.19 (make ufid_ino in struct ulfs_ufid 64-bit) -- via
a twisty maze of marginal if not illegal type punning it breaks the
cleaner.

This will need to be done over, but it requires substantially more
mechanism and compat ioctls. Booo.

diffstat:

 sys/ufs/lfs/ulfs_inode.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 562ff6b00f00 -r f6e65f662906 sys/ufs/lfs/ulfs_inode.h
--- a/sys/ufs/lfs/ulfs_inode.h  Tue Jun 21 05:04:16 2016 +0000
+++ b/sys/ufs/lfs/ulfs_inode.h  Tue Jun 21 06:14:40 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_inode.h,v 1.21 2016/06/20 03:29:52 dholland Exp $ */
+/*     $NetBSD: ulfs_inode.h,v 1.22 2016/06/21 06:14:40 dholland Exp $ */
 /*  from NetBSD: inode.h,v 1.72 2016/06/03 15:36:03 christos Exp  */
 
 /*
@@ -146,8 +146,8 @@
 struct ulfs_ufid {
        uint16_t ufid_len;      /* Length of structure. */
        uint16_t ufid_pad;      /* Force 32-bit alignment. */
+       uint32_t ufid_ino;      /* File number (ino). XXX should be 64 */
        int32_t   ufid_gen;     /* Generation number. */
-       uint64_t ufid_ino;      /* File number (ino). */
 };
 /* Filehandle structure for exported LFSes */
 struct lfid {