diff mbox

[1/2] nfs: Send atime and mtime as a 64bit value

Message ID 1366397547-14639-2-git-send-email-bjschuma@netapp.com (mailing list archive)
State New, archived
Headers show

Commit Message

Bryan Schumaker April 19, 2013, 6:52 p.m. UTC 
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>
---
 fs/nfs/nfs4xdr.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Trond Myklebust April 19, 2013, 7:03 p.m. UTC | #1 
On Fri, 2013-04-19 at 14:52 -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>
> ---
>  fs/nfs/nfs4xdr.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
> index 325eddc..b06dcaf 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, (long)iap->ia_atime.tv_sec);

On 32-bit systems, long is usually just 32-bits, which isn't what you
want. Please make the an explicit cast to s64.

>  		*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, (long)iap->ia_mtime.tv_sec);

Ditto...

>  		*p++ = cpu_to_be32(iap->ia_mtime.tv_nsec);
>  	}
>  	else if (iap->ia_valid & ATTR_MTIME) {
diff mbox

Patch

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 325eddc..b06dcaf 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, (long)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, (long)iap->ia_mtime.tv_sec);
 		*p++ = cpu_to_be32(iap->ia_mtime.tv_nsec);
 	}
 	else if (iap->ia_valid & ATTR_MTIME) {