From cf5600c5565bdda548adc9f4146b63992509adc7 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Tue, 13 Nov 2007 23:11:11 +0000
Subject: 2007-11-13  Thomas Schwinge  <tschwinge@gnu.org>

	* inode.c (read_disknode): Adapt to ``struct stat'' changes.
---
 isofs/ChangeLog |  6 +++++-
 isofs/inode.c   | 19 ++++---------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/isofs/ChangeLog b/isofs/ChangeLog
index bc8c3a73..33a232fa 100644
--- a/isofs/ChangeLog
+++ b/isofs/ChangeLog
@@ -1,6 +1,10 @@
+2007-11-13  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* inode.c (read_disknode): Adapt to ``struct stat'' changes.
+
 2007-03-25  Thomas Schwinge  <tschwinge@gnu.org>
 
-	* isofs/inode.c (read_disknode): Correctly convert from nanoseconds to
+	* inode.c (read_disknode): Correctly convert from nanoseconds to
 	microseconds.
 
 2005-02-23  Alfred M. Szmidt  <ams@gnu.org>
diff --git a/isofs/inode.c b/isofs/inode.c
index 091b75ba..99aca957 100644
--- a/isofs/inode.c
+++ b/isofs/inode.c
@@ -431,31 +431,20 @@ read_disknode (struct node *np, struct dirrect *dr,
     {
       struct timespec ts;
       isodate_915 (dr->date, &ts);
-      st->st_ctime = st->st_mtime = st->st_atime = ts.tv_sec;
-      st->st_ctime_usec = st->st_mtime_usec = st->st_atime_usec
-	= ts.tv_nsec / 1000;
+      st->st_ctim = st->st_mtim = st->st_atim = ts;
     }
 
   /* Override what we have better info for */
   if (rl->valid & VALID_TF)
     {
       if (rl->tfflags & TF_CREATION)
-	{
-	  st->st_ctime = rl->ctime.tv_sec;
-	  st->st_ctime_usec = rl->ctime.tv_nsec / 1000;
-	}
+	st->st_ctim = rl->ctime;
 
       if (rl->tfflags & TF_ACCESS)
-	{
-	  st->st_atime = rl->atime.tv_sec;
-	  st->st_atime_usec = rl->atime.tv_nsec / 1000;
-	}
+	st->st_atim = rl->atime;
 
       if (rl->tfflags & TF_MODIFY)
-	{
-	  st->st_mtime = rl->mtime.tv_sec;
-	  st->st_mtime_usec = rl->mtime.tv_nsec / 1000;
-	}
+	st->st_mtim = rl->mtime;
     }
 
   st->st_blksize = logical_block_size;
-- 
cgit v1.2.3