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/nfsserver/nfs_serv.c | 10 +++++----- sys/nfsserver/nfs_srvsubs.c | 8 ++++---- sys/nfsserver/nfsm_subs.h | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'sys/nfsserver') diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index 145a6e6..9f2010e 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.32 1996/09/03 14:24:59 bde Exp $ + * $Id: nfs_serv.c,v 1.33 1996/09/05 07:58:04 davidg Exp $ */ /* @@ -282,9 +282,9 @@ nfsrv_setattr(nfsd, slp, procp, mrq) #ifdef notyet fxdr_nfsv2time(&sp->sa_atime, &vap->va_atime); #else - vap->va_atime.ts_sec = + vap->va_atime.tv_sec = fxdr_unsigned(long, sp->sa_atime.nfsv2_sec); - vap->va_atime.ts_nsec = 0; + vap->va_atime.tv_nsec = 0; #endif } if (sp->sa_mtime.nfsv2_sec != nfs_xdrneg1) @@ -305,8 +305,8 @@ nfsrv_setattr(nfsd, slp, procp, mrq) if (v3) { error = preat_ret = VOP_GETATTR(vp, &preat, cred, procp); if (!error && gcheck && - (preat.va_ctime.ts_sec != guard.ts_sec || - preat.va_ctime.ts_nsec != guard.ts_nsec)) + (preat.va_ctime.tv_sec != guard.tv_sec || + preat.va_ctime.tv_nsec != guard.tv_nsec)) error = NFSERR_NOT_SYNC; if (error) { vput(vp); diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index c45e502..7d97f09 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.31 1996/07/16 10:19:44 dfr Exp $ + * $Id: nfs_subs.c,v 1.32 1996/08/21 21:55:51 dyson Exp $ */ /* @@ -1311,7 +1311,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) *vpp = vp = nvp; } } - np->n_mtime = mtime.ts_sec; + np->n_mtime = mtime.tv_sec; } vap = &np->n_vattr; vap->va_type = vtyp; @@ -1341,8 +1341,8 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) vap->va_fileid = fxdr_unsigned(long, fp->fa2_fileid); fxdr_nfsv2time(&fp->fa2_atime, &vap->va_atime); vap->va_flags = 0; - vap->va_ctime.ts_sec = fxdr_unsigned(long, fp->fa2_ctime.nfsv2_sec); - vap->va_ctime.ts_nsec = 0; + vap->va_ctime.tv_sec = fxdr_unsigned(long, fp->fa2_ctime.nfsv2_sec); + vap->va_ctime.tv_nsec = 0; vap->va_gen = fxdr_unsigned(u_long, fp->fa2_ctime.nfsv2_usec); vap->va_filerev = 0; } diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h index f935b7a..324df71 100644 --- a/sys/nfsserver/nfsm_subs.h +++ b/sys/nfsserver/nfsm_subs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsm_subs.h 8.1 (Berkeley) 6/16/93 - * $Id: nfsm_subs.h,v 1.7 1995/06/27 11:06:55 dfr Exp $ + * $Id: nfsm_subs.h,v 1.8 1995/08/24 10:45:16 dfr Exp $ */ #ifndef _NFS_NFSM_SUBS_H_ @@ -426,8 +426,8 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid, fxdr_nfsv3time(tl, &(a)->va_atime); \ break; \ case NFSV3SATTRTIME_TOSERVER: \ - (a)->va_atime.ts_sec = time.tv_sec; \ - (a)->va_atime.ts_nsec = time.tv_usec * 1000; \ + (a)->va_atime.tv_sec = time.tv_sec; \ + (a)->va_atime.tv_nsec = time.tv_usec * 1000; \ break; \ }; \ nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \ @@ -437,8 +437,8 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid, fxdr_nfsv3time(tl, &(a)->va_mtime); \ break; \ case NFSV3SATTRTIME_TOSERVER: \ - (a)->va_mtime.ts_sec = time.tv_sec; \ - (a)->va_mtime.ts_nsec = time.tv_usec * 1000; \ + (a)->va_mtime.tv_sec = time.tv_sec; \ + (a)->va_mtime.tv_nsec = time.tv_usec * 1000; \ break; \ }; } -- cgit v1.1