diff options
Diffstat (limited to 'sys/msdosfs')
| -rw-r--r-- | sys/msdosfs/msdosfs_conv.c | 8 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c index 033c4ac3c647..18e92fbc222d 100644 --- a/sys/msdosfs/msdosfs_conv.c +++ b/sys/msdosfs/msdosfs_conv.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_conv.c,v 1.8 1996/04/05 16:31:49 ache Exp $ */ +/* $Id: msdosfs_conv.c,v 1.9 1996/04/05 18:59:06 ache Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.6.2.1 1994/08/30 02:27:57 cgd Exp $ */ /* @@ -77,7 +77,7 @@ unix2dostime(tsp, ddp, dtp) * If the time from the last conversion is the same as now, then * skip the computations and use the saved result. */ - t = tsp->ts_sec - (tz.tz_minuteswest * 60) + t = tsp->tv_sec - (tz.tz_minuteswest * 60) - (wall_cmos_clock ? adjkerntz : 0); /* - daylight savings time correction */ if (lasttime != t) { @@ -175,10 +175,10 @@ dos2unixtime(dd, dt, tsp) days += ((dd & DD_DAY_MASK) >> DD_DAY_SHIFT) - 1; lastseconds = (days * 24 * 60 * 60) + SECONDSTO1980; } - tsp->ts_sec = seconds + lastseconds + (tz.tz_minuteswest * 60) + tsp->tv_sec = seconds + lastseconds + (tz.tz_minuteswest * 60) + adjkerntz; /* + daylight savings time correction */ - tsp->ts_nsec = 0; + tsp->tv_nsec = 0; } /* diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index bdd399f96060..ae56e2b7b652 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.31 1996/06/14 11:01:41 asami Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.32 1996/09/03 14:23:33 bde Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- @@ -464,7 +464,7 @@ msdosfs_setattr(ap) if (error) return error; } - if (vap->va_mtime.ts_sec != VNOVAL) { + if (vap->va_mtime.tv_sec != VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != dep->de_pmp->pm_uid && |