On Tue, 2022-10-18 at 15:58 -0400, Chuck Lever wrote:
> In a moment I'm going to introduce separate nfsd_file types, one of
> which is garbage-collected; the other, not. The garbage-collected
> variety is to be used by NFSv2 and v3, and the non-garbage-collected
> variety is to be used by NFSv4.
>
> nfsd_commit() is invoked by both NFSv3 and NFSv4 consumers. We want
> nfsd_commit() to find and use the correct variety of cached
> nfsd_file object for the NFS version that is in use.
>
> This is a refactoring change. No behavior change is expected.
>
> Tested-by: Jeff Layton <jlayton@xxxxxxxxxx>
> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> ---
> fs/nfsd/nfs3proc.c | 10 +++++++++-
> fs/nfsd/nfs4proc.c | 11 ++++++++++-
> fs/nfsd/vfs.c | 15 ++++-----------
> fs/nfsd/vfs.h | 3 ++-
> 4 files changed, 25 insertions(+), 14 deletions(-)
>
> diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
> index a41cca619338..d12823371857 100644
> --- a/fs/nfsd/nfs3proc.c
> +++ b/fs/nfsd/nfs3proc.c
> @@ -13,6 +13,7 @@
> #include "cache.h"
> #include "xdr3.h"
> #include "vfs.h"
> +#include "filecache.h"
>
> #define NFSDDBG_FACILITY NFSDDBG_PROC
>
> @@ -770,6 +771,7 @@ nfsd3_proc_commit(struct svc_rqst *rqstp)
> {
> struct nfsd3_commitargs *argp = rqstp->rq_argp;
> struct nfsd3_commitres *resp = rqstp->rq_resp;
> + struct nfsd_file *nf;
>
> dprintk("nfsd: COMMIT(3) %s %u@%Lu\n",
> SVCFH_fmt(&argp->fh),
> @@ -777,8 +779,14 @@ nfsd3_proc_commit(struct svc_rqst *rqstp)
> (unsigned long long) argp->offset);
>
> fh_copy(&resp->fh, &argp->fh);
> - resp->status = nfsd_commit(rqstp, &resp->fh, argp->offset,
> + resp->status = nfsd_file_acquire(rqstp, &resp->fh, NFSD_MAY_WRITE |
> + NFSD_MAY_NOT_BREAK_LEASE, &nf);
> + if (resp->status)
> + goto out;
> + resp->status = nfsd_commit(rqstp, &resp->fh, nf, argp->offset,
> argp->count, resp->verf);
> + nfsd_file_put(nf);
> +out:
> return rpc_success;
> }
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index a72ab97f77ef..d0d976f847ca 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -739,10 +739,19 @@ nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> union nfsd4_op_u *u)
> {
> struct nfsd4_commit *commit = &u->commit;
> + struct nfsd_file *nf;
> + __be32 status;
>
> - return nfsd_commit(rqstp, &cstate->current_fh, commit->co_offset,
> + status = nfsd_file_acquire(rqstp, &cstate->current_fh, NFSD_MAY_WRITE |
> + NFSD_MAY_NOT_BREAK_LEASE, &nf);
> + if (status != nfs_ok)
> + return status;
> +
> + status = nfsd_commit(rqstp, &cstate->current_fh, nf, commit->co_offset,
> commit->co_count,
> (__be32 *)commit->co_verf.data);
> + nfsd_file_put(nf);
> + return status;
> }
>
> static __be32
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index fc17b0ac8729..44f210ba17cc 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -1108,6 +1108,7 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset,
> * nfsd_commit - Commit pending writes to stable storage
> * @rqstp: RPC request being processed
> * @fhp: NFS filehandle
> + * @nf: target file
> * @offset: raw offset from beginning of file
> * @count: raw count of bytes to sync
> * @verf: filled in with the server's current write verifier
> @@ -1124,19 +1125,13 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset,
> * An nfsstat value in network byte order.
> */
> __be32
> -nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, u64 offset,
> - u32 count, __be32 *verf)
> +nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
> + u64 offset, u32 count, __be32 *verf)
> {
> + __be32 err = nfs_ok;
> u64 maxbytes;
> loff_t start, end;
> struct nfsd_net *nn;
> - struct nfsd_file *nf;
> - __be32 err;
> -
> - err = nfsd_file_acquire(rqstp, fhp,
> - NFSD_MAY_WRITE|NFSD_MAY_NOT_BREAK_LEASE, &nf);
> - if (err)
> - goto out;
>
> /*
> * Convert the client-provided (offset, count) range to a
> @@ -1177,8 +1172,6 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, u64 offset,
> } else
> nfsd_copy_write_verifier(verf, nn);
>
> - nfsd_file_put(nf);
> -out:
> return err;
> }
>
> diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
> index c95cd414b4bb..04dfd80570f0 100644
> --- a/fs/nfsd/vfs.h
> +++ b/fs/nfsd/vfs.h
> @@ -88,7 +88,8 @@ __be32 nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *);
> __be32 nfsd_create_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
> struct svc_fh *resfhp, struct nfsd_attrs *iap);
> __be32 nfsd_commit(struct svc_rqst *rqst, struct svc_fh *fhp,
> - u64 offset, u32 count, __be32 *verf);
> + struct nfsd_file *nf, u64 offset, u32 count,
> + __be32 *verf);
> #ifdef CONFIG_NFSD_V4
> __be32 nfsd_getxattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
> char *name, void **bufp, int *lenp);
>
>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
