From 10f666af84d48e89e4e2960415c9b616fce4077f Mon Sep 17 00:00:00 2001 From: dyson Date: Mon, 10 Feb 1997 02:22:35 +0000 Subject: This is the kernel Lite/2 commit. There are some requisite userland changes, so don't expect to be able to run the kernel as-is (very well) without the appropriate Lite/2 userland changes. The system boots and can mount UFS filesystems. Untested: ext2fs, msdosfs, NFS Known problems: Incorrect Berkeley ID strings in some files. Mount_std mounts will not work until the getfsent library routine is changed. Reviewed by: various people Submitted by: Jeffery Hsu --- sys/gnu/fs/ext2fs/ext2_inode_cnv.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'sys/gnu/fs/ext2fs/ext2_inode_cnv.c') diff --git a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c index fbc743b..a39e7b9 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c +++ b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c @@ -66,17 +66,17 @@ ext2_print_dinode( di ) di->di_uid, di->di_gid, di->di_size); printf( "Links: %3d Blockcount: %d\n", di->di_nlink, di->di_blocks); - printf( "ctime: 0x%x", di->di_ctime.tv_sec); + printf( "ctime: 0x%x", di->di_ctime); #if !defined(__FreeBSD__) - print_time(" -- %s\n", di->di_ctime.tv_sec); + print_time(" -- %s\n", di->di_ctime); #endif - printf( "atime: 0x%x", di->di_atime.tv_sec); + printf( "atime: 0x%x", di->di_atime); #if !defined(__FreeBSD__) - print_time(" -- %s\n", di->di_atime.tv_sec); + print_time(" -- %s\n", di->di_atime); #endif - printf( "mtime: 0x%x", di->di_mtime.tv_sec); + printf( "mtime: 0x%x", di->di_mtime); #if !defined(__FreeBSD__) - print_time(" -- %s\n", di->di_mtime.tv_sec); + print_time(" -- %s\n", di->di_mtime); #endif printf( "BLOCKS: "); for(i=0; i < (di->di_blocks <= 24 ? ((di->di_blocks+1)/2): 12); i++) @@ -110,9 +110,9 @@ ext2_ei2di(ei, di) */ di->di_mode = ei->i_links_count ? ei->i_mode : 0; di->di_size = ei->i_size; - di->di_atime.tv_sec = ei->i_atime; - di->di_mtime.tv_sec = ei->i_mtime; - di->di_ctime.tv_sec = ei->i_ctime; + di->di_atime = ei->i_atime; + di->di_mtime = ei->i_mtime; + di->di_ctime = ei->i_ctime; di->di_flags = 0; di->di_flags |= (ei->i_flags & EXT2_APPEND_FL) ? APPEND : 0; di->di_flags |= (ei->i_flags & EXT2_IMMUTABLE_FL) ? IMMUTABLE : 0; @@ -143,11 +143,11 @@ ext2_di2ei(di, ei) Godmar thinks: if dtime is nonzero, ext2 says this inode has been deleted, this would correspond to a zero link count */ - ei->i_dtime = ei->i_links_count ? 0 : di->di_mtime.tv_sec; + ei->i_dtime = ei->i_links_count ? 0 : di->di_mtime; ei->i_size = di->di_size; - ei->i_atime = di->di_atime.tv_sec; - ei->i_mtime = di->di_mtime.tv_sec; - ei->i_ctime = di->di_ctime.tv_sec; + ei->i_atime = di->di_atime; + ei->i_mtime = di->di_mtime; + ei->i_ctime = di->di_ctime; ei->i_flags = di->di_flags; ei->i_flags = 0; ei->i_flags |= (di->di_flags & APPEND) ? EXT2_APPEND_FL: 0; -- cgit v1.1