--- fs/nfs/nfs4xdr.c

+++ fs/nfs/nfs4xdr.c

@@ -840,8 +840,8 @@ static void encode_attrs(struct xdr_stre

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_mtime.tv_sec);

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

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

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

}

else if (iap->ia_valid & ATTR_ATIME) {

bmval1 |= FATTR4_WORD1_TIME_ACCESS_SET;

@@ -2096,7 +2096,7 @@ nfs4_xdr_enc_getacl(struct rpc_rqst *req

encode_compound_hdr(&xdr, req, &hdr);

encode_sequence(&xdr, &args->seq_args, &hdr);

encode_putfh(&xdr, args->fh, &hdr);

- replen = hdr.replen + nfs4_fattr_bitmap_maxsz + 1;

+ replen = hdr.replen + op_decode_hdr_maxsz + nfs4_fattr_bitmap_maxsz + 1;

encode_getattr_two(&xdr, FATTR4_WORD0_ACL, 0, &hdr);

xdr_inline_pages(&req->rq_rcv_buf, replen << 2,