di_?time is no longer a structure

SCCS-vsn: usr.sbin/mkproto/mkproto.c 8.3
SCCS-vsn: usr.sbin/quot/quot.c 8.5

diff --git a/usr/src/usr.sbin/mkproto/mkproto.c b/usr/src/usr.sbin/mkproto/mkproto.c
index 9dfbbad..8c77353 100644 (file)
--- a/usr/src/usr.sbin/mkproto/mkproto.c
+++ b/usr/src/usr.sbin/mkproto/mkproto.c
@@ -12,7 +12,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)mkproto.c  8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)mkproto.c  8.3 (Berkeley) %G%";
 #endif /* not lint */
 
 /*
@@ -333,8 +333,8 @@ iput(ip, aibc, ib, inum)
        struct timeval t;
 
        (void)gettimeofday(&t, NULL);
-       ip->di_atime.ts_sec = t.tv_sec;
-       ip->di_atime.ts_nsec = 0;
+       ip->di_atime = t.tv_sec;
+       ip->di_atimensec = 0;
        ip->di_mtime = ip->di_ctime = ip->di_atime;
        switch (ip->di_mode&IFMT) {
 

diff --git a/usr/src/usr.sbin/quot/quot.c b/usr/src/usr.sbin/quot/quot.c
index b89074c..330ac30 100644 (file)
--- a/usr/src/usr.sbin/quot/quot.c
+++ b/usr/src/usr.sbin/quot/quot.c
@@ -12,7 +12,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)quot.c     8.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)quot.c     8.5 (Berkeley) %G%";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -290,11 +290,11 @@ qacct(ip)
        }
        dp->blocks += size;
 #define        DAY (60 * 60 * 24)      /* seconds per day */
-       if (now.tv_sec - ip->di_atime.ts_sec > 30 * DAY)
+       if (now.tv_sec - ip->di_atime > 30 * DAY)
                dp->blocks30 += size;
-       if (now.tv_sec - ip->di_atime.ts_sec > 60 * DAY)
+       if (now.tv_sec - ip->di_atime > 60 * DAY)
                dp->blocks60 += size;
-       if (now.tv_sec - ip->di_atime.ts_sec > 90 * DAY)
+       if (now.tv_sec - ip->di_atime > 90 * DAY)
                dp->blocks90 += size;
        dp->nfiles++;
        while (nflg) {