Message ID | 1366402178-1281-2-git-send-email-bjschuma@netapp.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, 2013-04-19 at 16:09 -0400, bjschuma@netapp.com wrote: > From: Bryan Schumaker <bjschuma@netapp.com> > > RFC 3530 says that the seconds value of a nfstime4 structure is a 64bit > value, but we are instead sending a 32-bit 0 and then a 32bit conversion > of the 64bit Linux value. This means that if we try to set atime to a > value before the epoch (touch -t 196001010101) the client will only send > part of the new value due to lost precision. > > Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Thanks Bryan! Applied. I assume that Bruce will pick up the 2/2.
On Fri, Apr 19, 2013 at 09:22:29PM +0000, Myklebust, Trond wrote: > On Fri, 2013-04-19 at 16:09 -0400, bjschuma@netapp.com wrote: > > From: Bryan Schumaker <bjschuma@netapp.com> > > > > RFC 3530 says that the seconds value of a nfstime4 structure is a 64bit > > value, but we are instead sending a 32-bit 0 and then a 32bit conversion > > of the 64bit Linux value. This means that if we try to set atime to a > > value before the epoch (touch -t 196001010101) the client will only send > > part of the new value due to lost precision. > > > > Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> > > Thanks Bryan! Applied. > > I assume that Bruce will pick up the 2/2. Yep, thanks. (These should go to stable too, right?) --b. -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 325eddc..3c79c58 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -1054,8 +1054,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const if (iap->ia_valid & ATTR_ATIME_SET) { bmval1 |= FATTR4_WORD1_TIME_ACCESS_SET; *p++ = cpu_to_be32(NFS4_SET_TO_CLIENT_TIME); - *p++ = cpu_to_be32(0); - *p++ = cpu_to_be32(iap->ia_atime.tv_sec); + p = xdr_encode_hyper(p, (s64)iap->ia_atime.tv_sec); *p++ = cpu_to_be32(iap->ia_atime.tv_nsec); } else if (iap->ia_valid & ATTR_ATIME) { @@ -1065,8 +1064,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const if (iap->ia_valid & ATTR_MTIME_SET) { bmval1 |= FATTR4_WORD1_TIME_MODIFY_SET; *p++ = cpu_to_be32(NFS4_SET_TO_CLIENT_TIME); - *p++ = cpu_to_be32(0); - *p++ = cpu_to_be32(iap->ia_mtime.tv_sec); + p = xdr_encode_hyper(p, (s64)iap->ia_mtime.tv_sec); *p++ = cpu_to_be32(iap->ia_mtime.tv_nsec); } else if (iap->ia_valid & ATTR_MTIME) {