NFSD: Add an nfsd4_encode_nfstime4() helper

[ Upstream commit 262176798b18b12fd8ab84c94cfece0a6a652476 ]

Clean up: de-duplicate some common code.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Acked-by: Tom Talpey <tom@talpey.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 30c64c3f5fa05b9946bb5273d5d158d1cce74dd5..c40876daf60c0514256d03ea2d607098ec8ce6dc 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2542,6 +2542,20 @@ static __be32 *encode_change(__be32 *p, struct kstat *stat, struct inode *inode,
        return p;
 }
 
+static __be32 nfsd4_encode_nfstime4(struct xdr_stream *xdr,
+                                   struct timespec64 *tv)
+{
+       __be32 *p;
+
+       p = xdr_reserve_space(xdr, XDR_UNIT * 3);
+       if (!p)
+               return nfserr_resource;
+
+       p = xdr_encode_hyper(p, (s64)tv->tv_sec);
+       *p = cpu_to_be32(tv->tv_nsec);
+       return nfs_ok;
+}
+
 /*
  * ctime (in NFSv4, time_metadata) is not writeable, and the client
  * doesn't really care what resolution could theoretically be stored by
@@ -3347,11 +3361,9 @@ out_acl:
                p = xdr_encode_hyper(p, dummy64);
        }
        if (bmval1 & FATTR4_WORD1_TIME_ACCESS) {
-               p = xdr_reserve_space(xdr, 12);
-               if (!p)
-                       goto out_resource;
-               p = xdr_encode_hyper(p, (s64)stat.atime.tv_sec);
-               *p++ = cpu_to_be32(stat.atime.tv_nsec);
+               status = nfsd4_encode_nfstime4(xdr, &stat.atime);
+               if (status)
+                       goto out;
        }
        if (bmval1 & FATTR4_WORD1_TIME_DELTA) {
                p = xdr_reserve_space(xdr, 12);
@@ -3360,25 +3372,19 @@ out_acl:
                p = encode_time_delta(p, d_inode(dentry));
        }
        if (bmval1 & FATTR4_WORD1_TIME_METADATA) {
-               p = xdr_reserve_space(xdr, 12);
-               if (!p)
-                       goto out_resource;
-               p = xdr_encode_hyper(p, (s64)stat.ctime.tv_sec);
-               *p++ = cpu_to_be32(stat.ctime.tv_nsec);
+               status = nfsd4_encode_nfstime4(xdr, &stat.ctime);
+               if (status)
+                       goto out;
        }
        if (bmval1 & FATTR4_WORD1_TIME_MODIFY) {
-               p = xdr_reserve_space(xdr, 12);
-               if (!p)
-                       goto out_resource;
-               p = xdr_encode_hyper(p, (s64)stat.mtime.tv_sec);
-               *p++ = cpu_to_be32(stat.mtime.tv_nsec);
+               status = nfsd4_encode_nfstime4(xdr, &stat.mtime);
+               if (status)
+                       goto out;
        }
        if (bmval1 & FATTR4_WORD1_TIME_CREATE) {
-               p = xdr_reserve_space(xdr, 12);
-               if (!p)
-                       goto out_resource;
-               p = xdr_encode_hyper(p, (s64)stat.btime.tv_sec);
-               *p++ = cpu_to_be32(stat.btime.tv_nsec);
+               status = nfsd4_encode_nfstime4(xdr, &stat.btime);
+               if (status)
+                       goto out;
        }
        if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) {
                u64 ino = stat.ino;