NFSD: Add a helper that encodes NFSv3 directory offset cookies

Refactor: Add helper function similar to nfs3svc_encode_cookie3().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index 2088bb0887ba40079cb38180bca719dad5c36d59..5a0dd6e23c85c988025a08569f5457b565431a7c 100644 (file)
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -595,8 +595,7 @@ nfsd_proc_readdir(struct svc_rqst *rqstp)
                                    &resp->common, nfssvc_encode_entry);
 
        resp->count = resp->buffer - buffer;
-       if (resp->offset)
-               *resp->offset = htonl(offset);
+       nfssvc_encode_nfscookie(resp, offset);
 
        fh_put(&argp->fh);
        return rpc_success;

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 39d296aecd3e7248cc00477c8b7a07cd071a6ad3..a87b21cfe0d03ecb0337a0fde3a0e72974970a9f 100644 (file)
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -614,6 +614,21 @@ nfssvc_encode_statfsres(struct svc_rqst *rqstp, __be32 *p)
        return 1;
 }
 
+/**
+ * nfssvc_encode_nfscookie - Encode a directory offset cookie
+ * @resp: readdir result context
+ * @offset: offset cookie to encode
+ *
+ */
+void nfssvc_encode_nfscookie(struct nfsd_readdirres *resp, u32 offset)
+{
+       if (!resp->offset)
+               return;
+
+       *resp->offset = cpu_to_be32(offset);
+       resp->offset = NULL;
+}
+
 int
 nfssvc_encode_entry(void *ccdv, const char *name,
                    int namlen, loff_t offset, u64 ino, unsigned int d_type)
@@ -632,8 +647,7 @@ nfssvc_encode_entry(void *ccdv, const char *name,
                cd->common.err = nfserr_fbig;
                return -EINVAL;
        }
-       if (cd->offset)
-               *cd->offset = htonl(offset);
+       nfssvc_encode_nfscookie(cd, offset);
 
        /* truncate filename */
        namlen = min(namlen, NFS2_MAXNAMLEN);

diff --git a/fs/nfsd/xdr.h b/fs/nfsd/xdr.h
index 277b74c511ce73c2a90520bc444fcbbda25cdec5..651de13e62fedf6c0500b085e4422b08791d46db 100644 (file)
--- a/fs/nfsd/xdr.h
+++ b/fs/nfsd/xdr.h
@@ -157,6 +157,7 @@ int nfssvc_encode_readres(struct svc_rqst *, __be32 *);
 int nfssvc_encode_statfsres(struct svc_rqst *, __be32 *);
 int nfssvc_encode_readdirres(struct svc_rqst *, __be32 *);
 
+void nfssvc_encode_nfscookie(struct nfsd_readdirres *resp, u32 offset);
 int nfssvc_encode_entry(void *, const char *name,
                        int namlen, loff_t offset, u64 ino, unsigned int);