| Message ID | 20241017133631.213274-5-cel@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Simple lockd clean-ups | expand |
On Fri, 18 Oct 2024, cel@kernel.org wrote: > From: Chuck Lever <chuck.lever@oracle.com> > > This parameter has been unused since commit 09802fd2a8ca ("lockd: > rip out deferred lock handling from testlock codepath"). It's a minor point, but the parameter is described as "unused" and "this" but never as "cookie" or "nlm_cookie". So I enter the code section of the patch not being entirely sure what is being removed. NeilBrown > > Signed-off-by: Chuck Lever <chuck.lever@oracle.com> > --- > fs/lockd/svc4proc.c | 3 ++- > fs/lockd/svclock.c | 2 +- > fs/lockd/svcproc.c | 3 ++- > include/linux/lockd/lockd.h | 6 +++--- > 4 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c > index 1d0400d94b3d..2cb603013111 100644 > --- a/fs/lockd/svc4proc.c > +++ b/fs/lockd/svc4proc.c > @@ -108,7 +108,8 @@ __nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) > > test_owner = argp->lock.fl.c.flc_owner; > /* Now check for conflicting locks */ > - resp->status = nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie); > + resp->status = nlmsvc_testlock(rqstp, file, host, &argp->lock, > + &resp->lock); > if (resp->status == nlm_drop_reply) > rc = rpc_drop_reply; > else > diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c > index 1f2149db10f2..33e1fd159934 100644 > --- a/fs/lockd/svclock.c > +++ b/fs/lockd/svclock.c > @@ -609,7 +609,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, > __be32 > nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, > struct nlm_host *host, struct nlm_lock *lock, > - struct nlm_lock *conflock, struct nlm_cookie *cookie) > + struct nlm_lock *conflock) > { > int error; > int mode; > diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c > index d959a5dbe0ae..f53d5177f267 100644 > --- a/fs/lockd/svcproc.c > +++ b/fs/lockd/svcproc.c > @@ -130,7 +130,8 @@ __nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) > test_owner = argp->lock.fl.c.flc_owner; > > /* Now check for conflicting locks */ > - resp->status = cast_status(nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie)); > + resp->status = cast_status(nlmsvc_testlock(rqstp, file, host, > + &argp->lock, &resp->lock)); > if (resp->status == nlm_drop_reply) > rc = rpc_drop_reply; > else > diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h > index 61c4b9c41904..c8f0f9458f2c 100644 > --- a/include/linux/lockd/lockd.h > +++ b/include/linux/lockd/lockd.h > @@ -278,9 +278,9 @@ __be32 nlmsvc_lock(struct svc_rqst *, struct nlm_file *, > struct nlm_host *, struct nlm_lock *, int, > struct nlm_cookie *, int); > __be32 nlmsvc_unlock(struct net *net, struct nlm_file *, struct nlm_lock *); > -__be32 nlmsvc_testlock(struct svc_rqst *, struct nlm_file *, > - struct nlm_host *, struct nlm_lock *, > - struct nlm_lock *, struct nlm_cookie *); > +__be32 nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, > + struct nlm_host *host, struct nlm_lock *lock, > + struct nlm_lock *conflock); > __be32 nlmsvc_cancel_blocked(struct net *net, struct nlm_file *, struct nlm_lock *); > void nlmsvc_retry_blocked(struct svc_rqst *rqstp); > void nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *, > -- > 2.46.2 > >
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index 1d0400d94b3d..2cb603013111 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c @@ -108,7 +108,8 @@ __nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) test_owner = argp->lock.fl.c.flc_owner; /* Now check for conflicting locks */ - resp->status = nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie); + resp->status = nlmsvc_testlock(rqstp, file, host, &argp->lock, + &resp->lock); if (resp->status == nlm_drop_reply) rc = rpc_drop_reply; else diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 1f2149db10f2..33e1fd159934 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -609,7 +609,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, __be32 nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, struct nlm_host *host, struct nlm_lock *lock, - struct nlm_lock *conflock, struct nlm_cookie *cookie) + struct nlm_lock *conflock) { int error; int mode; diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index d959a5dbe0ae..f53d5177f267 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -130,7 +130,8 @@ __nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) test_owner = argp->lock.fl.c.flc_owner; /* Now check for conflicting locks */ - resp->status = cast_status(nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie)); + resp->status = cast_status(nlmsvc_testlock(rqstp, file, host, + &argp->lock, &resp->lock)); if (resp->status == nlm_drop_reply) rc = rpc_drop_reply; else diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 61c4b9c41904..c8f0f9458f2c 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -278,9 +278,9 @@ __be32 nlmsvc_lock(struct svc_rqst *, struct nlm_file *, struct nlm_host *, struct nlm_lock *, int, struct nlm_cookie *, int); __be32 nlmsvc_unlock(struct net *net, struct nlm_file *, struct nlm_lock *); -__be32 nlmsvc_testlock(struct svc_rqst *, struct nlm_file *, - struct nlm_host *, struct nlm_lock *, - struct nlm_lock *, struct nlm_cookie *); +__be32 nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, + struct nlm_host *host, struct nlm_lock *lock, + struct nlm_lock *conflock); __be32 nlmsvc_cancel_blocked(struct net *net, struct nlm_file *, struct nlm_lock *); void nlmsvc_retry_blocked(struct svc_rqst *rqstp); void nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,