From 45c85d421d05f7b96a102826ea41b4f7dc31c017 Mon Sep 17 00:00:00 2001 From: nate Date: Thu, 19 Sep 1996 18:21:32 +0000 Subject: In sys/time.h, struct timespec is defined as: /* * Structure defined by POSIX.4 to be like a timeval. */ struct timespec { time_t ts_sec; /* seconds */ long ts_nsec; /* and nanoseconds */ }; The correct names of the fields are tv_sec and tv_nsec. Reminded by: James Drobina --- sys/ufs/ffs/ffs_inode.c | 8 ++++---- sys/ufs/ufs/inode.h | 8 ++++---- sys/ufs/ufs/ufs_vnops.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'sys/ufs') diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 63186c6..b916e08 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: ffs_inode.c,v 1.19 1996/01/05 18:31:48 wollman Exp $ + * $Id: ffs_inode.c,v 1.20 1996/01/19 03:59:12 dyson Exp $ */ #include "opt_quota.h" @@ -115,15 +115,15 @@ ffs_update(ap) */ tv_sec = time.tv_sec; if (ip->i_flag & IN_ACCESS) - ip->i_atime.ts_sec = + ip->i_atime.tv_sec = (ap->a_access == &time ? tv_sec : ap->a_access->tv_sec); if (ip->i_flag & IN_UPDATE) { - ip->i_mtime.ts_sec = + ip->i_mtime.tv_sec = (ap->a_modify == &time ? tv_sec : ap->a_modify->tv_sec); ip->i_modrev++; } if (ip->i_flag & IN_CHANGE) - ip->i_ctime.ts_sec = tv_sec; + ip->i_ctime.tv_sec = tv_sec; ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE); fs = ip->i_fs; /* diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index 30d5f1b..75055a3 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)inode.h 8.4 (Berkeley) 1/21/94 - * $Id: inode.h,v 1.7 1995/11/05 23:35:56 dyson Exp $ + * $Id: inode.h,v 1.8 1996/01/30 23:02:15 mpp Exp $ */ #ifndef _UFS_UFS_INODE_H_ @@ -155,15 +155,15 @@ struct indir { if ((ip)->i_flag & (IN_ACCESS | IN_CHANGE | IN_UPDATE)) { \ (ip)->i_flag |= IN_MODIFIED; \ if ((ip)->i_flag & IN_ACCESS) \ - (ip)->i_atime.ts_sec \ + (ip)->i_atime.tv_sec \ = ((t1) == &time ? tv_sec : (t1)->tv_sec); \ if ((ip)->i_flag & IN_UPDATE) { \ - (ip)->i_mtime.ts_sec \ + (ip)->i_mtime.tv_sec \ = ((t2) == &time ? tv_sec : (t2)->tv_sec); \ (ip)->i_modrev++; \ } \ if ((ip)->i_flag & IN_CHANGE) \ - (ip)->i_ctime.ts_sec = tv_sec; \ + (ip)->i_ctime.tv_sec = tv_sec; \ (ip)->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_UPDATE); \ } \ } diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 4084a11..7712a8e 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.10 (Berkeley) 4/1/94 - * $Id: ufs_vnops.c,v 1.39 1996/07/09 16:51:18 wollman Exp $ + * $Id: ufs_vnops.c,v 1.40 1996/09/03 14:25:27 bde Exp $ */ #include "opt_quota.h" @@ -417,7 +417,7 @@ ufs_setattr(ap) return (error); } ip = VTOI(vp); - if (vap->va_atime.ts_sec != VNOVAL || vap->va_mtime.ts_sec != VNOVAL) { + if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != ip->i_uid && @@ -425,14 +425,14 @@ ufs_setattr(ap) ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || (error = VOP_ACCESS(vp, VWRITE, cred, p)))) return (error); - if (vap->va_atime.ts_sec != VNOVAL) + if (vap->va_atime.tv_sec != VNOVAL) ip->i_flag |= IN_ACCESS; - if (vap->va_mtime.ts_sec != VNOVAL) + if (vap->va_mtime.tv_sec != VNOVAL) ip->i_flag |= IN_CHANGE | IN_UPDATE; - atimeval.tv_sec = vap->va_atime.ts_sec; - atimeval.tv_usec = vap->va_atime.ts_nsec / 1000; - mtimeval.tv_sec = vap->va_mtime.ts_sec; - mtimeval.tv_usec = vap->va_mtime.ts_nsec / 1000; + atimeval.tv_sec = vap->va_atime.tv_sec; + atimeval.tv_usec = vap->va_atime.tv_nsec / 1000; + mtimeval.tv_sec = vap->va_mtime.tv_sec; + mtimeval.tv_usec = vap->va_mtime.tv_nsec / 1000; error = VOP_UPDATE(vp, &atimeval, &mtimeval, 1); if (error) return (error); -- cgit v1.1