After all file systems have been converted to use 'struct inode_time' for timestamps, we can remove the compatibility definition for this structure. This patch picks the first of the three variants I defined, but we could pick one of the others as well. Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> --- include/linux/time.h | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/include/linux/time.h b/include/linux/time.h index f431263..00d2f14 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -6,44 +6,17 @@ # include <linux/math64.h> #include <uapi/linux/time.h> -#ifdef CONFIG_NEW_INODE_TIME /* * This is the type we use internally in the kernel to represent - * absolute times in file system metadata. + * absolute times in file system metadata using unsigned seconds + * lets us extend the life span for another 69 years beyond 2038. * This structure must not leak out to user space, and new interfaces * should be using 64-bit types right away. */ - -/* - * Variant a) using unsigned seconds lets us extend the life span - * for another 69 years beyond 2038. - */ struct inode_time { unsigned long tv_sec; long tv_nsec; }; -#elif 0 -/* - * This variant can represent the widest range of times, but also - * bloats 'struct inode' a little more. - */ -struct inode_time { - long long tv_sec __attribute__((packed)); - int tv_nsec; -}; -#elif 0 -/* - * The variant using bit fields is less efficient to access, but - * small and has a wider range as the 32-bit one, plus it keeps - * the signedness of the original timespec. - */ -struct inode_time { - long long tv_sec : 34; - int tv_nsec : 30; -}; -#else -#define inode_time timespec -#endif extern struct timezone sys_tz; -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html