[src/trunk]: src/sys/ufs/lfs Merge -r1.67 of ufs/inode.h: make the inode fiel...

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

details:   https://anonhg.NetBSD.org/src/rev/96049688aea2
branches:  trunk
changeset: 816149:96049688aea2
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jun 20 01:05:36 2016 +0000

description:
Merge -r1.67 of ufs/inode.h: make the inode field of a filehandle
64-bit instead of truncating to 32 bits. Note that if you're serving
nfs off lfs (but I don't think you are as I think there are known
fatal problems doing so) you'll need to reboot your clients after this
change.

I've used a 64-bit value explicitly instead of ino_t (as in the ufs
structure) because this is a structure whose size ought to be well
defined. I remember some discussion of this when the ufs change was
committed, but not the conclusion (if any) -- if anyone hates this it
can be changed to ino_t easily enough.

diffstat:

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

diffs (21 lines):

diff -r 43a854a6bb90 -r 96049688aea2 sys/ufs/lfs/ulfs_inode.h
--- a/sys/ufs/lfs/ulfs_inode.h  Mon Jun 20 00:53:10 2016 +0000
+++ b/sys/ufs/lfs/ulfs_inode.h  Mon Jun 20 01:05:36 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_inode.h,v 1.18 2016/06/20 00:18:40 dholland Exp $ */
-/*  from NetBSD: inode.h,v 1.66 2014/05/08 08:21:53 hannken Exp  */
+/*     $NetBSD: ulfs_inode.h,v 1.19 2016/06/20 01:05:36 dholland Exp $ */
+/*  from NetBSD: inode.h,v 1.67 2014/05/14 13:46:19 martin Exp  */
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -146,8 +146,8 @@
 struct ulfs_ufid {
        u_int16_t ufid_len;     /* Length of structure. */
        u_int16_t ufid_pad;     /* Force 32-bit alignment. */
-       u_int32_t ufid_ino;     /* File number (ino). */
        int32_t   ufid_gen;     /* Generation number. */
+       u_int64_t ufid_ino;     /* File number (ino). */
 };
 /* Filehandle structure for exported LFSes */
 struct lfid {