lockd: Remove unused parameter to nlmsvc_testlock()

The nlm_cookie parameter has been unused since commit 09802fd2a8ca
("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>

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 1d0400d94b3df0be7774d8b659849011afa204db..2cb6030131117133255b8895949018dacfc781de 100644 (file)
--- 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 1f2149db10f2469562fce16af291246dbeae9ee6..33e1fd1599343628f310adcbed1adb4f3332b95e 100644 (file)
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -609,7 +609,7 @@ out:
 __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 d959a5dbe0ae8893da5fe4cd2992cb570eccf7bc..f53d5177f26732092242fcabe32f0f8931fc1fb6 100644 (file)
--- 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 61c4b9c419042fede75dcd569b41386491fe3299..c8f0f9458f2cc035fd9161f8f2486ba76084abf1 100644 (file)
--- 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 *,