Module Name: src
Committed By: dholland
Date: Mon Sep 21 01:24:39 UTC 2015
Modified Files:
src/sys/ufs/lfs: lfs.h lfs_accessors.h
Log Message:
Oops, I forgot to make the atime in the 64-bit IFILE 64 bits.
Correct that. Incompatible change, but no LFS64 volumes can have been
created yet.
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.31 -r1.32 src/sys/ufs/lfs/lfs_accessors.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/lfs.h
diff -u src/sys/ufs/lfs/lfs.h:1.191 src/sys/ufs/lfs/lfs.h:1.192
--- src/sys/ufs/lfs/lfs.h:1.191 Mon Sep 21 01:24:23 2015
+++ src/sys/ufs/lfs/lfs.h Mon Sep 21 01:24:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.191 2015/09/21 01:24:23 dholland Exp $ */
+/* $NetBSD: lfs.h,v 1.192 2015/09/21 01:24:39 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 */
@@ -588,11 +588,10 @@ typedef union finfo {
typedef struct ifile64 IFILE64;
struct ifile64 {
u_int32_t if_version; /* inode version number */
- u_int32_t if_pad; /* 64-bit alignment padding */
+ u_int32_t if_atime_nsec; /* and nanoseconds */
+ u_int64_t if_atime_sec; /* Last access time, seconds */
int64_t if_daddr; /* inode disk address */
u_int64_t if_nextfree; /* next-unallocated inode */
- u_int32_t if_atime_sec; /* Last access time, seconds */
- u_int32_t if_atime_nsec; /* and nanoseconds */
};
typedef struct ifile32 IFILE32;
Index: src/sys/ufs/lfs/lfs_accessors.h
diff -u src/sys/ufs/lfs/lfs_accessors.h:1.31 src/sys/ufs/lfs/lfs_accessors.h:1.32
--- src/sys/ufs/lfs/lfs_accessors.h:1.31 Mon Sep 21 01:24:23 2015
+++ src/sys/ufs/lfs/lfs_accessors.h Mon Sep 21 01:24:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_accessors.h,v 1.31 2015/09/21 01:24:23 dholland Exp $ */
+/* $NetBSD: lfs_accessors.h,v 1.32 2015/09/21 01:24:39 dholland 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 */
@@ -832,7 +832,7 @@ lfs_fi_setblock(STRUCT_LFS *fs, FINFO *f
LFS_DEF_IF_ACCESSOR(u_int32_t, u_int32_t, version);
LFS_DEF_IF_ACCESSOR(int64_t, int32_t, daddr);
LFS_DEF_IF_ACCESSOR(u_int64_t, u_int32_t, nextfree);
-LFS_DEF_IF_ACCESSOR(u_int32_t, u_int32_t, atime_sec);
+LFS_DEF_IF_ACCESSOR(u_int64_t, u_int32_t, atime_sec);
LFS_DEF_IF_ACCESSOR(u_int32_t, u_int32_t, atime_nsec);
/*
