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

Submitted by Konstantin Khorenko on Dec. 17, 2018, 8:53 a.m.

Details

Message ID 201812170853.wBH8rgLe026580@finist-ce7.sw.ru
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko Dec. 17, 2018, 8:53 a.m.
The commit is pushed to "branch-rh7-3.10.0-862.20.2.vz7.73.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.20.2.vz7.73.22
------>
commit 6dbd666f9f1c6ab01020b8143f51fed097d45fed
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Mon Dec 17 11:52:47 2018 +0300

    Revert "sunrpc: bc_svc_flush_queue_net() helper introduced"
    
    This reverts commit 7cb91b5b96ff4ab294ffb04d0f6486edc0e7cde8.
    
    Reason of https://jira.sw.ru/browse/PSBM-75751-75751 was found
    incorrectly, patch is not required.
    
    The issue will be properly fixed in the scope of
    https://jira.sw.ru/browse/PSBM-89609
    
    Signed-off-by: Vasily Averin <vvs@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 fe70ff076ad5..2b3086893194 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 2ca4ff71167a..de8cded1ef46 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