SUNRPC: Clean up bc_svc_process()

The test robot complained that, in some build configurations, the
@error variable in bc_svc_process's only caller is set but never
used. This happens because dprintk() is the only consumer of that
value.

 - Remove the dprintk() call sites in favor of the svc_process
   tracepoint
 - The @error variable and the return value of bc_svc_process() are
   now unused, so get rid of them.
 - The @serv parameter is set to rqstp->rq_serv by the only caller,
   and bc_svc_process() then uses it only to set rqstp->rq_serv. It
   can be removed.
 - Rename bc_svc_process() according to the convention that
   globally-visible RPC server functions have names that begin with
   "svc_"; and because it is globally-visible, give it a proper
   kdoc comment.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202308121314.HA8Rq2XG-lkp@intel.com/
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 466ebf1d41b2b749ae20ac2a75635f7f1063b6e5..272e6d2bb47854020a6e2670a5a9d5115f491aa9 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -95,7 +95,6 @@ nfs41_callback_svc(void *vrqstp)
        struct svc_rqst *rqstp = vrqstp;
        struct svc_serv *serv = rqstp->rq_server;
        struct rpc_rqst *req;
-       int error;
        DEFINE_WAIT(wq);
 
        set_freezable();
@@ -109,10 +108,7 @@ nfs41_callback_svc(void *vrqstp)
                        list_del(&req->rq_bc_list);
                        spin_unlock_bh(&serv->sv_cb_lock);
                        finish_wait(&serv->sv_cb_waitq, &wq);
-                       dprintk("Invoking bc_svc_process()\n");
-                       error = bc_svc_process(serv, req, rqstp);
-                       dprintk("bc_svc_process() returned w/ error code= %d\n",
-                               error);
+                       svc_process_bc(req, rqstp);
                } else {
                        spin_unlock_bh(&serv->sv_cb_lock);
                        if (!kthread_should_stop())

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index dbf5b21feafe484664bf1ab6fbdbf4defeb52c63..0cdca5960171c6329b567ead7228c7af270cdf4c 100644 (file)
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -413,8 +413,7 @@ struct svc_serv *  svc_create_pooled(struct svc_program *, unsigned int,
 int               svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
 int               svc_pool_stats_open(struct svc_serv *serv, struct file *file);
 void              svc_process(struct svc_rqst *rqstp);
-int               bc_svc_process(struct svc_serv *, struct rpc_rqst *,
-                       struct svc_rqst *);
+void              svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp);
 int               svc_register(const struct svc_serv *, struct net *, const int,
                                const unsigned short, const unsigned short);
 

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 812fda9d45dd6353270adc6375185486c5284a6d..a3d031deb1ec79ada9ef556354e2c5e2ef70824a 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1544,24 +1544,20 @@ out_drop:
 }
 
 #if defined(CONFIG_SUNRPC_BACKCHANNEL)
-/*
- * Process a backchannel RPC request that arrived over an existing
- * outbound connection
+/**
+ * svc_process_bc - process a reverse-direction RPC request
+ * @req: RPC request to be used for client-side processing
+ * @rqstp: server-side execution context
+ *
  */
-int
-bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req,
-              struct svc_rqst *rqstp)
+void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp)
 {
        struct rpc_task *task;
        int proc_error;
-       int error;
-
-       dprintk("svc: %s(%p)\n", __func__, req);
 
        /* Build the svc_rqst used by the common processing routine */
        rqstp->rq_xid = req->rq_xid;
        rqstp->rq_prot = req->rq_xprt->prot;
-       rqstp->rq_server = serv;
        rqstp->rq_bc_net = req->rq_xprt->xprt_net;
 
        rqstp->rq_addrlen = sizeof(req->rq_xprt->addr);
@@ -1590,10 +1586,8 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req,
         * been processed by the caller.
         */
        svcxdr_init_decode(rqstp);
-       if (!xdr_inline_decode(&rqstp->rq_arg_stream, XDR_UNIT * 2)) {
-               error = -EINVAL;
-               goto out;
-       }
+       if (!xdr_inline_decode(&rqstp->rq_arg_stream, XDR_UNIT * 2))
+               return;
 
        /* Parse and execute the bc call */
        proc_error = svc_process_common(rqstp);
@@ -1602,26 +1596,18 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req,
        if (!proc_error) {
                /* Processing error: drop the request */
                xprt_free_bc_request(req);
-               error = -EINVAL;
-               goto out;
+               return;
        }
        /* Finally, send the reply synchronously */
        memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));
        task = rpc_run_bc_task(req);
-       if (IS_ERR(task)) {
-               error = PTR_ERR(task);
-               goto out;
-       }
+       if (IS_ERR(task))
+               return;
 
        WARN_ON_ONCE(atomic_read(&task->tk_count) != 1);
-       error = task->tk_status;
        rpc_put_task(task);
-
-out:
-       dprintk("svc: %s(), error=%d\n", __func__, error);
-       return error;
 }
-EXPORT_SYMBOL_GPL(bc_svc_process);
+EXPORT_SYMBOL_GPL(svc_process_bc);
 #endif /* CONFIG_SUNRPC_BACKCHANNEL */
 
 /**