2007-11-13 Thomas Schwinge <tschwinge@gnu.org>

	* inode.c (read_disknode, write_node): Adapt to ``struct stat''
	changes.

1 files changed, 12 insertions, 24 deletions

diff --git a/ufs/inode.c b/ufs/inode.c
index 8223fe7f..1a8a7098 100644
--- a/ufs/inode.c
+++ b/ufs/inode.c
@@ -233,18 +233,12 @@ read_disknode (struct node *np)
 		 | (di->di_trans ? S_IPTRANS : 0));
   st->st_nlink = read_disk_entry (di->di_nlink);
   st->st_size = read_disk_entry (di->di_size);
-#ifdef notyet
-  st->st_atimespec = di->di_atime;
-  st->st_mtimespec = di->di_mtime;
-  st->st_ctimespec = di->di_ctime;
-#else
-  st->st_atime = read_disk_entry (di->di_atime.tv_sec);
-  st->st_atime_usec = read_disk_entry (di->di_atime.tv_nsec) / 1000;
-  st->st_mtime = read_disk_entry (di->di_mtime.tv_sec);
-  st->st_mtime_usec = read_disk_entry (di->di_mtime.tv_nsec) / 1000;
-  st->st_ctime = read_disk_entry (di->di_ctime.tv_sec);
-  st->st_ctime_usec = read_disk_entry (di->di_ctime.tv_nsec) / 1000;
-#endif
+  st->st_atim.tv_sec = read_disk_entry (di->di_atime.tv_sec);
+  st->st_atim.tv_nsec = read_disk_entry (di->di_atime.tv_nsec);
+  st->st_mtim.tv_sec = read_disk_entry (di->di_mtime.tv_sec);
+  st->st_mtim.tv_nsec = read_disk_entry (di->di_mtime.tv_nsec);
+  st->st_ctim.tv_sec = read_disk_entry (di->di_ctime.tv_sec);
+  st->st_ctim.tv_nsec = read_disk_entry (di->di_ctime.tv_nsec);
   st->st_blksize = sblock->fs_bsize;
   st->st_blocks = read_disk_entry (di->di_blocks);
   st->st_flags = read_disk_entry (di->di_flags);
@@ -359,18 +353,12 @@ write_node (struct node *np)
 
       write_disk_entry (di->di_nlink, st->st_nlink);
       write_disk_entry (di->di_size, st->st_size);
-#ifdef notyet
-      di->di_atime = st->st_atimespec;
-      di->di_mtime = st->st_mtimespec;
-      di->di_ctime = st->st_ctimespec;
-#else
-      write_disk_entry (di->di_atime.tv_sec, st->st_atime);
-      write_disk_entry (di->di_atime.tv_nsec, st->st_atime_usec * 1000);
-      write_disk_entry (di->di_mtime.tv_sec, st->st_mtime);
-      write_disk_entry (di->di_mtime.tv_nsec, st->st_mtime_usec * 1000);
-      write_disk_entry (di->di_ctime.tv_sec, st->st_ctime);
-      write_disk_entry (di->di_ctime.tv_nsec, st->st_ctime_usec * 1000);
-#endif
+      write_disk_entry (di->di_atime.tv_sec, st->st_atim.tv_sec);
+      write_disk_entry (di->di_atime.tv_nsec, st->st_atim.tv_nsec);
+      write_disk_entry (di->di_mtime.tv_sec, st->st_mtim.tv_sec);
+      write_disk_entry (di->di_mtime.tv_nsec, st->st_mtim.tv_nsec);
+      write_disk_entry (di->di_ctime.tv_sec, st->st_ctim.tv_sec);
+      write_disk_entry (di->di_ctime.tv_nsec, st->st_ctim.tv_nsec);
       write_disk_entry (di->di_blocks, st->st_blocks);
       write_disk_entry (di->di_flags, st->st_flags);