From patchwork Wed Jul 27 18:43:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 9250303 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6963560866 for ; Wed, 27 Jul 2016 18:45:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59F88237A5 for ; Wed, 27 Jul 2016 18:45:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43C4E26907; Wed, 27 Jul 2016 18:45:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1F0625223 for ; Wed, 27 Jul 2016 18:45:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757928AbcG0SpJ (ORCPT ); Wed, 27 Jul 2016 14:45:09 -0400 Received: from mx141.netapp.com ([216.240.21.12]:19787 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757960AbcG0SpH (ORCPT ); Wed, 27 Jul 2016 14:45:07 -0400 X-IronPort-AV: E=Sophos;i="5.28,430,1464678000"; d="scan'208";a="135071687" Received: from vmwexchts04-prd.hq.netapp.com ([10.122.105.32]) by mx141-out.netapp.com with ESMTP; 27 Jul 2016 11:45:06 -0700 Received: from smtp1.corp.netapp.com (10.57.156.124) by VMWEXCHTS04-PRD.hq.netapp.com (10.122.105.32) with Microsoft SMTP Server id 15.0.1210.3; Wed, 27 Jul 2016 11:45:06 -0700 Received: from rhel7-2-ga-2.androsad.fake (andros-new.vpn.netapp.com [10.55.74.172]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id u6RIj2pJ010724; Wed, 27 Jul 2016 11:45:06 -0700 (PDT) From: To: CC: , , Andy Adamson Subject: [PATCH Version 7 5/8] SUNRPC add remove xprt flag to rpc_task_release_client Date: Wed, 27 Jul 2016 14:43:17 -0400 Message-ID: <1469645000-19791-6-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1469645000-19791-1-git-send-email-andros@netapp.com> References: <1469645000-19791-1-git-send-email-andros@netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andy Adamson Want to specify which rpc_xprt to use in rpc_run_task. Don't pass in an rpc_xprt in rpc_init_task just to have it not used as it is removed in rpc_task_release_client. Signed-off-by: Andy Adamson --- include/linux/sunrpc/clnt.h | 2 +- net/sunrpc/clnt.c | 7 +++---- net/sunrpc/sched.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index b6810c9..99410bb 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h @@ -148,7 +148,7 @@ int rpc_switch_client_transport(struct rpc_clnt *, void rpc_shutdown_client(struct rpc_clnt *); void rpc_release_client(struct rpc_clnt *); -void rpc_task_release_client(struct rpc_task *); +void rpc_task_release_client(struct rpc_task *, int); int rpcb_create_local(struct net *); void rpcb_put_local(struct net *); diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index cb49898..459f9b1 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -961,7 +961,7 @@ out: } EXPORT_SYMBOL_GPL(rpc_bind_new_program); -void rpc_task_release_client(struct rpc_task *task) +void rpc_task_release_client(struct rpc_task *task, int rm_xprt) { struct rpc_clnt *clnt = task->tk_client; struct rpc_xprt *xprt = task->tk_xprt; @@ -976,9 +976,8 @@ void rpc_task_release_client(struct rpc_task *task) rpc_release_client(clnt); } - if (xprt != NULL) { + if (rm_xprt && xprt) { task->tk_xprt = NULL; - xprt_put(xprt); } } @@ -988,7 +987,7 @@ void rpc_task_set_client(struct rpc_task *task, struct rpc_clnt *clnt) { if (clnt != NULL) { - rpc_task_release_client(task); + rpc_task_release_client(task, 0); if (task->tk_xprt == NULL) task->tk_xprt = xprt_iter_get_next(&clnt->cl_xpi); task->tk_client = clnt; diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 9ae5885..575b254 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -1017,7 +1017,7 @@ static void rpc_release_resources_task(struct rpc_task *task) put_rpccred(task->tk_msg.rpc_cred); task->tk_msg.rpc_cred = NULL; } - rpc_task_release_client(task); + rpc_task_release_client(task, 1); } static void rpc_final_put_task(struct rpc_task *task,