NFSD: Add nfsd4_encode_fattr4_lease_time()

Refactor the encoder for FATTR4_LEASE_TIME into a helper. In a
subsequent patch, this helper will be called from a bitmask loop.

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

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index aa3081e..308f031 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3064,6 +3064,14 @@ static __be32 nfsd4_encode_fattr4_fsid(struct xdr_stream *xdr,
        return nfs_ok;
 }
 
+static __be32 nfsd4_encode_fattr4_lease_time(struct xdr_stream *xdr,
+                                            const struct nfsd4_fattr_args *args)
+{
+       struct nfsd_net *nn = net_generic(SVC_NET(args->rqstp), nfsd_net_id);
+
+       return nfsd4_encode_nfs_lease4(xdr, nn->nfsd4_lease);
+}
+
 /*
  * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
  * ourselves.
@@ -3095,7 +3103,6 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
                .mnt    = exp->ex_path.mnt,
                .dentry = dentry,
        };
-       struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
        bool file_modified;
        u64 size = 0;
 
@@ -3244,10 +3251,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
                        goto out;
        }
        if (bmval0 & FATTR4_WORD0_LEASE_TIME) {
-               p = xdr_reserve_space(xdr, 4);
-               if (!p)
-                       goto out_resource;
-               *p++ = cpu_to_be32(nn->nfsd4_lease);
+               status = nfsd4_encode_fattr4_lease_time(xdr, &args);
+               if (status != nfs_ok)
+                       goto out;
        }
        if (bmval0 & FATTR4_WORD0_RDATTR_ERROR) {
                p = xdr_reserve_space(xdr, 4);

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index d6059b0..488ecda 100644 (file)
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -90,6 +90,8 @@ nfsd4_encode_uint32_t(struct xdr_stream *xdr, u32 val)
        return nfs_ok;
 }
 
+#define nfsd4_encode_nfs_lease4(x, v)  nfsd4_encode_uint32_t(x, v)
+
 /**
  * nfsd4_encode_uint64_t - Encode an XDR uint64_t type result
  * @xdr: target XDR stream