nfsd: use 64-bit seconds fields in nfsd v4 code
Subsystems (3)
PATCH 1/2 nfsd: use 64-bit seconds fields in nfsd v4 code
From: "J. Bruce Fields" <[email protected]>
After commit 95582b008388 "vfs: change inode times to use struct timespec64" there are spots in the NFSv4 decoding where we decode the protocol into a struct timeval and then convert that into a timeval64.
That's unnecesary in the NFSv4 case since the on-the-wire protocol also uses 64-bit values. So just fix up our code to use timeval64 everywhere.
Signed-off-by J. Bruce Fields <[email protected]>
--- fs/nfsd/blocklayout.c | 8 +++----- fs/nfsd/nfs4xdr.c | 13 ++++--------- fs/nfsd/xdr4.h | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-)
fs/nfsd/blocklayout.c +3 -5
@@ -121,15 +121,13 @@ nfsd4_block_commit_blocks(struct inode *inode, struct nfsd4_layoutcommit *lcp, {loff_t new_size = lcp->lc_last_wr +1 ;struct iattr iattr = { .ia_valid =0 }; -struct timespec ts;int error; - ts =timespec64_to_timespec (inode->i_mtime);if (lcp->lc_mtime.tv_nsec ==UTIME_NOW || -timespec_compare (&lcp->lc_mtime, &ts) <0 ) - lcp->lc_mtime =timespec64_to_timespec (current_time (inode)); +timespec64_compare (&lcp->lc_mtime, &inode->i_mtime) <0 ) + lcp->lc_mtime =current_time (inode); iattr.ia_valid |=ATTR_ATIME |ATTR_CTIME |ATTR_MTIME ; - iattr.ia_atime = iattr.ia_ctime = iattr.ia_mtime =timespec_to_timespec64 (lcp->lc_mtime); + iattr.ia_atime = iattr.ia_ctime = iattr.ia_mtime = lcp->lc_mtime;if (new_size >i_size_read (inode)) { iattr.ia_valid |=ATTR_SIZE ;
fs/nfsd/nfs4xdr.c +4 -9
@@ -274,14 +274,12 @@ static char *savemem(struct nfsd4_compoundargs *argp, __be32 *p, int nbytes)* we ignore all 32 bits of 'nseconds'. */ static __be32 -nfsd4_decode_time (struct nfsd4_compoundargs *argp,struct timespec *tv) +nfsd4_decode_time (struct nfsd4_compoundargs *argp,struct timespec64 *tv) {DECODE_HEAD ; -u64 sec;READ_BUF (12 ); - p =xdr_decode_hyper (p, &sec); - tv->tv_sec = sec; + p =xdr_decode_hyper (p, &tv->tv_sec); tv->tv_nsec =be32_to_cpup (p++);if (tv->tv_nsec >= (u32 )1000000000 )return nfserr_inval;
@@ -320,7 +318,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *iattr, struct nfs4_acl **acl, struct xdr_netobj *label, int *umask) { - struct timespec ts; int expected_len, len = 0;u32 dummy32;char *buf;
@@ -422,8 +419,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,switch (dummy32) {case NFS4_SET_TO_CLIENT_TIME : len +=12 ; - status =nfsd4_decode_time (argp, &ts); - iattr->ia_atime =timespec_to_timespec64 (ts); + status =nfsd4_decode_time (argp, &iattr->ia_atime);if (status)return status; iattr->ia_valid |= (ATTR_ATIME |ATTR_ATIME_SET );
@@ -442,8 +438,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,switch (dummy32) {case NFS4_SET_TO_CLIENT_TIME : len +=12 ; - status =nfsd4_decode_time (argp, &ts); - iattr->ia_mtime =timespec_to_timespec64 (ts); + status =nfsd4_decode_time (argp, &iattr->ia_mtime);if (status)return status; iattr->ia_valid |= (ATTR_MTIME |ATTR_MTIME_SET );
fs/nfsd/xdr4.h +1 -1
@@ -472,7 +472,7 @@ struct nfsd4_layoutcommit {u32 lc_reclaim;/* request */ u32 lc_newoffset;/* request */ u64 lc_last_wr;/* request */ -struct timespec lc_mtime;/* request */ +struct timespec64 lc_mtime;/* request */ u32 lc_layout_type;/* request */ u32 lc_up_len;/* layout length */ void *lc_up_layout;/* decoded by callback */
Signature · 1 line
2.21.0
PATCH 2/2 nfsd4: remove outdated nfsd4_decode_time comment
From: "J. Bruce Fields" <[email protected]>
Commit bf8d909705e "nfsd: Decode and send 64bit time values" fixed the code without updating the comment.
Signed-off-by J. Bruce Fields <[email protected]>
--- fs/nfsd/nfs4xdr.c | 4 ---- 1 file changed, 4 deletions(-)
fs/nfsd/nfs4xdr.c +0 -4
@@ -269,10 +269,6 @@ static char *savemem(struct nfsd4_compoundargs *argp, __be32 *p, int nbytes)return ret; } -/* -* We require the high 32 bits of 'seconds' to be 0, and -* we ignore all 32 bits of 'nseconds'. -*/ static __be32 nfsd4_decode_time (struct nfsd4_compoundargs *argp,struct timespec64 *tv) {
Signature · 1 line
2.21.0