Commit 042ad0b3 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

nfs: Send atime and mtime as a 64bit value 



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: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 549b19cc

fs/nfs/nfs4xdr.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1058,8 +1058,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const 
	if (iap->ia_valid & ATTR_ATIME_SET) {

	if (iap->ia_valid & ATTR_ATIME_SET) {

		bmval1 |= FATTR4_WORD1_TIME_ACCESS_SET;

		bmval1 |= FATTR4_WORD1_TIME_ACCESS_SET;

		*p++ = cpu_to_be32(NFS4_SET_TO_CLIENT_TIME);

		*p++ = cpu_to_be32(NFS4_SET_TO_CLIENT_TIME);

		*p++ = cpu_to_be32(0);

		p = xdr_encode_hyper(p, (s64)iap->ia_atime.tv_sec);

		*p++ = cpu_to_be32(iap->ia_atime.tv_sec);

		*p++ = cpu_to_be32(iap->ia_atime.tv_nsec);

		*p++ = cpu_to_be32(iap->ia_atime.tv_nsec);

	}

	}

	else if (iap->ia_valid & ATTR_ATIME) {

	else if (iap->ia_valid & ATTR_ATIME) {
@@ -1069,8 +1068,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const 
	if (iap->ia_valid & ATTR_MTIME_SET) {

	if (iap->ia_valid & ATTR_MTIME_SET) {

		bmval1 |= FATTR4_WORD1_TIME_MODIFY_SET;

		bmval1 |= FATTR4_WORD1_TIME_MODIFY_SET;

		*p++ = cpu_to_be32(NFS4_SET_TO_CLIENT_TIME);

		*p++ = cpu_to_be32(NFS4_SET_TO_CLIENT_TIME);

		*p++ = cpu_to_be32(0);

		p = xdr_encode_hyper(p, (s64)iap->ia_mtime.tv_sec);

		*p++ = cpu_to_be32(iap->ia_mtime.tv_sec);

		*p++ = cpu_to_be32(iap->ia_mtime.tv_nsec);

		*p++ = cpu_to_be32(iap->ia_mtime.tv_nsec);

	}

	}

	else if (iap->ia_valid & ATTR_MTIME) {

	else if (iap->ia_valid & ATTR_MTIME) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE