Module Name: src
Committed By: dholland
Date: Tue Jun 21 06:14:40 UTC 2016
Modified Files:
src/sys/ufs/lfs: ulfs_inode.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/lfs/ulfs_inode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/ulfs_inode.h
diff -u src/sys/ufs/lfs/ulfs_inode.h:1.21 src/sys/ufs/lfs/ulfs_inode.h:1.22
--- src/sys/ufs/lfs/ulfs_inode.h:1.21 Mon Jun 20 03:29:52 2016
+++ src/sys/ufs/lfs/ulfs_inode.h Tue Jun 21 06:14:40 2016
@@ -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 @@ typedef struct lfs_res_blk {
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 {
