lockd: Use xdrgen XDR functions for the NLMv4 UNLOCK_MSG procedure

Convert the UNLOCK_MSG procedure to use xdrgen functions
nlm4_svc_decode_nlm4_unlockargs and nlm4_svc_encode_void.
The procedure handler uses the nlm4_unlockargs_wrapper
structure that bridges between xdrgen types and the legacy
nlm_lock representation.

The pc_argzero field is set to zero because xdrgen decoders
reliably initialize all arguments, making the early
defensive memset unnecessary.

The NLM async callback mechanism uses client-side functions
which continue to take legacy struct nlm_res, preventing
UNLOCK and UNLOCK_MSG from sharing code for now.

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

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 01e21b0a89565c4db9ddc7ed80bc3975445af32f..c42c641dc5b6c3099179526058edce16c4700dbe 100644 (file)
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -523,41 +523,6 @@ out:
                rpc_drop_reply : rpc_success;
 }
 
-/*
- * UNLOCK: release a lock
- */
-static __be32
-__nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_res *resp)
-{
-       struct nlm_args *argp = rqstp->rq_argp;
-       struct nlm_host *host;
-       struct nlm_file *file;
-
-       dprintk("lockd: UNLOCK        called\n");
-
-       resp->cookie = argp->cookie;
-
-       /* Don't accept new lock requests during grace period */
-       if (locks_in_grace(SVC_NET(rqstp))) {
-               resp->status = nlm_lck_denied_grace_period;
-               return rpc_success;
-       }
-
-       /* Obtain client and file */
-       if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))
-               return resp->status == nlm__int__drop_reply ?
-                       rpc_drop_reply : rpc_success;
-
-       /* Now try to remove the lock */
-       resp->status = nlmsvc_unlock(SVC_NET(rqstp), file, &argp->lock);
-
-       dprintk("lockd: UNLOCK        status %d\n", ntohl(resp->status));
-       nlmsvc_release_lockowner(&argp->lock);
-       nlmsvc_release_host(host);
-       nlm_release_file(file);
-       return rpc_success;
-}
-
 /**
  * nlm4svc_proc_unlock - UNLOCK: Remove a lock
  * @rqstp: RPC transaction context
@@ -904,19 +869,67 @@ static __be32 nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp)
                                __nlm4svc_proc_cancel_msg);
 }
 
-static __be32 nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp)
+static __be32
+__nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_res *resp)
 {
-       struct nlm_args *argp = rqstp->rq_argp;
-       struct nlm_host *host;
+       struct nlm4_unlockargs_wrapper *argp = rqstp->rq_argp;
+       struct net *net = SVC_NET(rqstp);
+       struct nlm_file *file = NULL;
+       struct nlm_host *host = NULL;
 
-       dprintk("lockd: UNLOCK_MSG    called\n");
+       resp->status = nlm_lck_denied_nolocks;
+       if (nlm4_netobj_to_cookie(&resp->cookie, &argp->xdrgen.cookie))
+               goto out;
 
-       host = nlmsvc_lookup_host(rqstp, argp->lock.caller, argp->lock.len);
+       resp->status = nlm_lck_denied_grace_period;
+       if (locks_in_grace(net))
+               goto out;
+
+       resp->status = nlm_lck_denied_nolocks;
+       host = nlm4svc_lookup_host(rqstp, argp->xdrgen.alock.caller_name, false);
+       if (!host)
+               goto out;
+
+       resp->status = nlm4svc_lookup_file(rqstp, host, &argp->lock,
+                                          &file, &argp->xdrgen.alock, F_UNLCK);
+       if (resp->status)
+               goto out;
+
+       resp->status = nlmsvc_unlock(net, file, &argp->lock);
+       nlmsvc_release_lockowner(&argp->lock);
+
+out:
+       if (file)
+               nlm_release_file(file);
+       nlmsvc_release_host(host);
+       return resp->status == nlm__int__drop_reply ?
+               rpc_drop_reply : rpc_success;
+}
+
+/**
+ * nlm4svc_proc_unlock_msg - UNLOCK_MSG: Remove an existing lock
+ * @rqstp: RPC transaction context
+ *
+ * Returns:
+ *   %rpc_success:             RPC executed successfully.
+ *   %rpc_system_err:          RPC execution failed.
+ *
+ * RPC synopsis:
+ *   void NLMPROC4_UNLOCK_MSG(nlm4_unlockargs) = 9;
+ *
+ * The response to this request is delivered via the UNLOCK_RES procedure.
+ */
+static __be32 nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp)
+{
+       struct nlm4_unlockargs_wrapper *argp = rqstp->rq_argp;
+       struct nlm_host *host;
+
+       host = nlm4svc_lookup_host(rqstp, argp->xdrgen.alock.caller_name, false);
        if (!host)
                return rpc_system_err;
 
-       return nlm4svc_callback(rqstp, host, NLMPROC_UNLOCK_RES,
-                               __nlm4svc_proc_unlock);
+       return nlm4svc_callback(rqstp, host, NLMPROC4_UNLOCK_RES,
+                               __nlm4svc_proc_unlock_msg);
 }
 
 static __be32 nlm4svc_proc_granted_msg(struct svc_rqst *rqstp)
@@ -1185,15 +1198,15 @@ static const struct svc_procedure nlm4svc_procedures[24] = {
                .pc_xdrressize  = XDR_void,
                .pc_name        = "CANCEL_MSG",
        },
-       [NLMPROC_UNLOCK_MSG] = {
-               .pc_func = nlm4svc_proc_unlock_msg,
-               .pc_decode = nlm4svc_decode_unlockargs,
-               .pc_encode = nlm4svc_encode_void,
-               .pc_argsize = sizeof(struct nlm_args),
-               .pc_argzero = sizeof(struct nlm_args),
-               .pc_ressize = sizeof(struct nlm_void),
-               .pc_xdrressize = St,
-               .pc_name = "UNLOCK_MSG",
+       [NLMPROC4_UNLOCK_MSG] = {
+               .pc_func        = nlm4svc_proc_unlock_msg,
+               .pc_decode      = nlm4_svc_decode_nlm4_unlockargs,
+               .pc_encode      = nlm4_svc_encode_void,
+               .pc_argsize     = sizeof(struct nlm4_unlockargs_wrapper),
+               .pc_argzero     = 0,
+               .pc_ressize     = 0,
+               .pc_xdrressize  = XDR_void,
+               .pc_name        = "UNLOCK_MSG",
        },
        [NLMPROC_GRANTED_MSG] = {
                .pc_func = nlm4svc_proc_granted_msg,