Commit 8994a512 authored Oct 17, 2024 by Chuck Lever

lockd: Remove unused parameter to nlmsvc_testlock()



The nlm_cookie parameter has been unused since commit 09802fd2
("lockd: rip out deferred lock handling from testlock codepath").

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

parent a872c731

fs/lockd/svc4proc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

fs/lockd/svclock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

fs/lockd/svcproc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

include/linux/lockd/lockd.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 ,