From patchwork Wed May 11 19:08:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 9073961 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2EDAA9F372 for ; Wed, 11 May 2016 19:09:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4994B20172 for ; Wed, 11 May 2016 19:09:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D4982014A for ; Wed, 11 May 2016 19:09:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751707AbcEKTI4 (ORCPT ); Wed, 11 May 2016 15:08:56 -0400 Received: from mx142.netapp.com ([216.240.21.19]:63470 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752343AbcEKTIy (ORCPT ); Wed, 11 May 2016 15:08:54 -0400 X-IronPort-AV: E=Sophos;i="5.24,608,1455004800"; d="scan'208";a="110451241" Received: from vmwexchts03-prd.hq.netapp.com ([10.122.105.31]) by mx142-out.netapp.com with ESMTP; 11 May 2016 12:08:54 -0700 Received: from smtp1.corp.netapp.com (10.57.156.124) by VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) with Microsoft SMTP Server id 15.0.1156.6; Wed, 11 May 2016 12:08:53 -0700 Received: from localhost.localdomain (andros-new.vpn.netapp.com [10.55.76.232]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id u4BJ8lX5028221; Wed, 11 May 2016 12:08:53 -0700 (PDT) From: To: CC: , , , Andy Adamson Subject: [PATCH Version 4 06/10] SUNRPC add flag to rpc_task_release_client Date: Wed, 11 May 2016 15:08:21 -0400 Message-ID: <1462993705-14673-7-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1462993705-14673-1-git-send-email-andros@netapp.com> References: <1462993705-14673-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-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.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 | 6 +++--- net/sunrpc/sched.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index 9a7ddba..b2c5b75 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h @@ -150,7 +150,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 7e0c9bf..e157d09 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -942,7 +942,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; @@ -957,7 +957,7 @@ 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); @@ -969,7 +969,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 fcfd48d..0dacd9c 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -993,7 +993,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,