[RHEL7,COMMIT] Revert "sunrpc: bc_svc_flush_queue_net() helper introduced"

Submitted by Konstantin Khorenko on Nov. 13, 2017, 8:29 a.m.

Details

Message ID 201711130829.vAD8TtYE016326@finist_ce7.work
State New
Series "nfs: fix race between callback shutdown and execution"
Headers show

Commit Message

Konstantin Khorenko Nov. 13, 2017, 8:29 a.m.
The commit is pushed to "branch-rh7-3.10.0-693.1.1.vz7.37.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.1.1.vz7.37.26
------>
commit 8742ccbe2d3e6aa8b821639ab915909780c9e790
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Mon Nov 13 11:25:44 2017 +0300

    Revert "sunrpc: bc_svc_flush_queue_net() helper introduced"
    
    This reverts commit 99bfffc43ae40204d445f2c138071176d3e7b03d.
    
    Temporary revert due to
    https://jira.sw.ru/browse/PSBM-77114
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 include/linux/sunrpc/svc.h |  2 --
 net/sunrpc/svc.c           | 15 ---------------
 2 files changed, 17 deletions(-)

Patch hide | download patch | download mbox

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index fe70ff0..2b30868 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -484,8 +484,6 @@  void		   svc_reserve(struct svc_rqst *rqstp, int space);
 struct svc_pool *  svc_pool_for_cpu(struct svc_serv *serv, int cpu);
 char *		   svc_print_addr(struct svc_rqst *, char *, size_t);
 
-void bc_svc_flush_queue_net(struct svc_serv *serv, struct net *net);
-
 #define	RPC_MAX_ADDRBUFLEN	(63U)
 
 /*
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 2ca4ff7..de8cded1 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1338,21 +1338,6 @@  svc_process(struct svc_rqst *rqstp)
 EXPORT_SYMBOL_GPL(svc_process);
 
 #if defined(CONFIG_SUNRPC_BACKCHANNEL)
-void bc_svc_flush_queue_net(struct svc_serv *serv, struct net *net)
-{
-	struct rpc_rqst *req, *tmp;
-
-	spin_lock_bh(&serv->sv_cb_lock);
-	list_for_each_entry_safe(req, tmp, &serv->sv_cb_list, rq_bc_list) {
-		if (req->rq_xprt->xprt_net == net) {
-			list_del(&req->rq_bc_list);
-			xprt_free_bc_request(req);
-		}
-	}
-	spin_unlock_bh(&serv->sv_cb_lock);
-}
-EXPORT_SYMBOL_GPL(bc_svc_flush_queue_net);
-
 /*
  * Process a backchannel RPC request that arrived over an existing
  * outbound connection