From patchwork Wed Jan 11 20:15:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9511167 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 8F0CA60710 for ; Wed, 11 Jan 2017 20:18:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74E1E2868C for ; Wed, 11 Jan 2017 20:18:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69A2D2868E; Wed, 11 Jan 2017 20:18:23 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 6F58428689 for ; Wed, 11 Jan 2017 20:18:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751929AbdAKUQn (ORCPT ); Wed, 11 Jan 2017 15:16:43 -0500 Received: from mx144.netapp.com ([216.240.21.25]:48676 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752415AbdAKUQ3 (ORCPT ); Wed, 11 Jan 2017 15:16:29 -0500 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="169905510" Received: from vmwexchts01-prd.hq.netapp.com ([10.122.105.12]) by mx144-out.netapp.com with ESMTP; 11 Jan 2017 12:10:21 -0800 Received: from VMWEXCCAS01-PRD.hq.netapp.com (10.122.105.11) by VMWEXCHTS01-PRD.hq.netapp.com (10.122.105.12) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 11 Jan 2017 12:15:49 -0800 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS01-PRD.hq.netapp.com (10.122.105.11) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Wed, 11 Jan 2017 12:15:49 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.onmicrosoft.com; s=selector1-netapp-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=jp7bK0WOaxbAyWmitPaOmYtGHi2YxsE7uUuY+xAnA+I=; b=ViBwFA9DbfIQTEQFkxXc0jGDJ34AnR3YePzeDD9dEGyj8kR/qlvso8ZErgbcH4QkrhtFM9IAuRAoyaDceoFUWd0XJ+b4wNynV6FccNl6wS/3GyGqdp9v6HxotAfX9p0ZqfAQ6d9MloikByumFojtv/AP2sh6mVnVlsgCz0f9pps= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anna.Schumaker@netapp.com; Received: from gouda.nowheycreamery.com.nowheycreamery.com (99.9.112.69) by SN1PR0601MB1648.namprd06.prod.outlook.com (10.163.203.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Wed, 11 Jan 2017 20:15:47 +0000 From: To: Subject: [PATCH 1/2] NFS: Remove nfs4_wait_for_completion_rpc_task() Date: Wed, 11 Jan 2017 15:15:05 -0500 Message-ID: <20170111201506.3736-1-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Originating-IP: [99.9.112.69] X-ClientProxiedBy: BN6PR02CA0030.namprd02.prod.outlook.com (10.173.146.144) To SN1PR0601MB1648.namprd06.prod.outlook.com (10.163.203.142) X-MS-Office365-Filtering-Correlation-Id: b5dbc48b-9dd3-4e63-f72c-08d43a5ea1cc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1648; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1648; 3:Bs+ywtknX0IwGERVLZQQyHIbuTfQHq0xmYKmbSIE3tdzkHKYFJvUjJpcjtyMfnpuqXDzc/eCfCbirQYi8p1zkLeBEiY0vN/vIlh3EEunfJsbEIdN7/uGgzvuWQ5Z49GnevO+lpb/eeZWW6eSXOXq/GRqZnL7o21BF8Vb3n27EzP7W9Lxy9D/Ps+gDYty3nfl1U9ifzOjeMJXSjy3u54hZ2sMKXZcvwfLXqPxC3N8NLGvwh63oVkexj5t1nqysHXJJmGYKyQjjWiLqRIir+ooiw==; 25:aRkR0E3oG/vrFsnuKZZvSgjRdlHH7W+CFywUX/tbIjj1ixRmFiH4wjWErkm7r+OS+BCKyfLK5GdALW73EMh+tGpk3t3xok32FbHHyO1n8hlqOVl4q7QGk5YdYxI0iUtTVqGqsvyx6ChgDmUYYPN47+Ac6Ea6RCqSYe/aqeiSBQM9FCFHbpdLTRTdBCnUckQFIlsm/LQV5gaqRFadRDO9JjoYc3zQoQw6LVMwAPr8GKaU/jOtb3OmD83f9X9aX2HlrkPGhhxrGnKMXnmBBEj468vTIg+0vVrEkCpSc4/7XbVOHAvtEZgWNtshKnuEUIB2xoffxy+CuD/zq+gfJZFaiZcoj6DvpiQ8wSXAsfTLADQDPJiczK3WPxADIyQpiKjaSQHs8KFSi576HKOsoKnfqzwFVuZWja6qjoXLiGik1aROeTYjCrnjY6l5mX/xw+OgEApVCUpJwf66Fwp8UF/9oA== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1648; 31:vJiVqudW6NXho+J2mx86U5xvlZBVZ87bGMPDRa/t6kAhjvyxTZtktMwOjENnNxkGA8RwAJ2Gb0NnTZvU4cmvp4cFEqc1m7MCYumL23hVtuL2EwcWfRJQO36NXJsqB7EyvhcuEm9SwERbZF4PqCRUdI56RdQzsl/PDuD7mYbQuJlDQ5jg07dZhxtIPL/2A+Fjg3b0+Mk4Vpg6y6Dvjaifnp27FxGesKXgoHUybOMat7e1a0F3g7hI61A+9SARV2kp6TK+1YWN2hGA4BqSfzqS8w==; 20:HUNrfYiC3oQh/W91vTX+rkGrlScyenAKM6b6BWm9OhbXr2IowBGr5EAl+d7ScFMQlQlP7BYdQUyITD4GbPyLECeMitbWu8jSY5ABioMnqkH0ZBK3nAx72X7XVyITmF2MD0odzICGiGF1P1lmOoXqX9LwKsMbgVfSB6pamMe1yJcg+nfSU3bv6z7t4udCPY9McApvul14mQ5IFQvgWNw2UQ6e+EyUSyxHYl3v1vjDO6u3fKNRLqOhETx81LMbTu6K20TbcjJbw6yUKc2+JVUEEhpc2GZRvJEWgUncdYtWClnamFnDE/T3FMXmlmsaD3KF4Ts7vq3xPShJeHEzkLlp58oOBqlVAEDH3FzQkamZdCgC/iWIZygTPZr1JwE1rwghs88YfQV6+MVp06dpyJ1ZwuE/9MIWo98SnJ+fu88TEunPUQVgvloLr2z8fyM7gAFuHPNykS3CSplurDKxaX79vDoTEhnblpjHCpwKwJ95ahkWYDBvh8PV6OpfojDFbVGR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123558021)(20161123555025)(20161123562025)(20161123564025)(6072148); SRVR:SN1PR0601MB1648; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0601MB1648; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1648; 4:zt7/6iG9YOyenkLTzYFAJm5m+dhr0QpsRyM8tM4wWs9bArbo7LxeHcju0C2+lXGI30vEoSQxupEedhiUEXWG0nxgt+RFquEN276ymm20ZX6Ma+pEv1ewyN2lVYa/yo5RP50cUNMJlTHoEVQDUVxgv7PzLuyCQh0MzMtOtQ4t1hEfLRYmw6IBg2tXja/lYhMyb9xzwpjTgjqVDCeKwvQVG/kXjQ2GIA1ny7uBmBLjOPyuPSLee2yJQp8Wn5ayciZ/dJirBzJXuxYWe4r4DZKjuDNVhxtl5hopY0+4IIkNUJG91nq9/426GIUj2/RE0dAxvu/TE6/6oy8RivpU74idpBKajV2GfBVBQMeHvAvUU0RhF2DP1FNY7pe62fbNVWZhEACFCzMHlTv/WjZ55id02pF0TCAaKK3Ix3eGWrjR8xHQp8OLMjzrAjZadQ1eG2dofMLcr/BR5jCU47ZCRUfUWpVMD3iUCaB9bd3ztksqyWjVqh82uP6+kDvAbRIExrtjDhseULo4Mhkb3YDQuTbKnVxgRiOwZLM7AUv8kgyKgvwQsLbz6u4E+dRvkxOfB93AnvntiG8bfBaHV1rnd0lzkprEI0Z9zCq3t7x3xZzAkHNyTmtx68KEgsVo21IG6qRA X-Forefront-PRVS: 01842C458A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(305945005)(48376002)(66066001)(1076002)(86152003)(47776003)(107886002)(6116002)(2876002)(3846002)(189998001)(50466002)(450100001)(6486002)(38730400001)(86362001)(101416001)(6512007)(25786008)(2906002)(6506006)(7736002)(97736004)(92566002)(50986999)(8676002)(110136003)(36756003)(81166006)(2351001)(81156014)(6916009)(42186005)(6666003)(5660300001)(68736007)(105586002)(50226002)(106356001)(5003940100001)(15760500002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0601MB1648; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: netapp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0601MB1648; 23:KICKxRHke5buQBPFowJTwpK66Wq53ZOHtfHTR+2?= =?us-ascii?Q?mcI1Wx77g6S3CpJJYGi6pR45TZ2/KZTg9Z52YDcUXi3QwoXOQ5Tz5ji6uvbq?= =?us-ascii?Q?0kiAba6zRVDer63OS3zzpgEtZFd4TmXC9l3vGr8TuJ0qj9bEdue5sY4vW8bu?= =?us-ascii?Q?lRjUEzc9MeAUzWBkSCHWcK/HKEvbbaHl7jFscIQpuammjEiYOvP3UdV4xD0k?= =?us-ascii?Q?m8zgfEWWIrJPAV5GcfhAU25sD+gpUTml2pb05ve1Qtd4DOwc11npZVFXw9L/?= =?us-ascii?Q?k+cmd+7e8znvfBT0gZgbDJmrGWTfGU/C+TIPJnggaU56DEByBliS7O456nUK?= =?us-ascii?Q?xnFbg0lXHefaKmlV9J80MQs6hZU9DHIYh2R8yo+tyoxSvBTYbVBGYikuenTS?= =?us-ascii?Q?23u5oOCmmiRU9aKjcl6kfgSQTtP98SNDZ6zdd8MpisRn8vcsxlonBCyFOVRl?= =?us-ascii?Q?sa96oUSqxYfUVpPAF4st2VX/eM2XuuO0s8BEEf3GLL8V8GIDZMzgTYKXuinh?= =?us-ascii?Q?2jfj/z4DN+8mv0Qe5BXcwwtDTqymhzAHq4OuBTanbYwYWX6nzh0XZNrfcPS2?= =?us-ascii?Q?KjT3j+60iyZsfZ9yTgD9af/zyN65z1TXAHLGh2FACM9ugRQiBTMVwnxoMuFC?= =?us-ascii?Q?fQbqS1KKrzsmSlumFLBI4UAuGHJFoRbCwMMDrxmhbvqf01lCwFoDEQ+b5Cav?= =?us-ascii?Q?PDn1unCiURtBCG6T9oaxp0YWvLwgNUbzP3IGccsfTIHSNU+AW+RPE9lBKw0M?= =?us-ascii?Q?tDqotgMq0kjgC5xOafNzo7O8esIbtKZJqWyDKgAcD5znCeBfimAd8mwM9HD+?= =?us-ascii?Q?6iZgyxxWZvZQuvyHNe+Z81wXaJ7w6kleu3SRt5fs4yybNLjZRCCBwAlJZlVA?= =?us-ascii?Q?EPj+IMeNTYV/G/mUhUkK1/yGIYGLW01KLmgLJswFAyr4+/Nlpnxt1aAsxYN7?= =?us-ascii?Q?TZz/uvKVAY/5zPSFUmQ3MM/EqLcjrMkmzLW/ORKnWFaHXYmJqhWCkGhq2R7A?= =?us-ascii?Q?P70A6+apnMu0U8BOyrqoEuFb8BjVNqfs20SgArnMEesxOhEaSfLIMZ9ELhEg?= =?us-ascii?Q?KLggZs+zDWMZMrPO/Zw2WDjDI8ovOALJSrmFZJlUO6afvItfZzUGG1iUwmGq?= =?us-ascii?Q?ps/TQ+9m5X/sNEVeagoxF/bIAagiowr1U?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1648; 6:QSEQj9M3nPpd2DRu214vE5b9akTfbceL3JrR4pk11pY1yGjAcSI507Kw0VZEkbIl1+iSjE+Mv5qzI1XeMnwaRDaYWW9b09HGXSxDW9iN05WLQM/oo+P74Bg9uQI7qxMdg/ZCpWe7K88PKTWzQPazF23ry+CjmgjSkItq3chCTsdauNH2dDEIzra7Jk8a8BgSitRvmURbY+llmWE6wp+ABQvOGoeVoeUO61D7ccc2ZKR80nMHZN+psXY4CNtyfwcfLiXJdARxIDwJa7qyo3mvgLZJrzZjDrKB0gmOcj5VUdTLkUyGk9lQVm1iCnSYy3qcIeymA6wwnIdmiCX7tjRzWzi0snwH9lKc3ysRGoPaJyh54wjYQRwl9iabuA2sHs2KcPxsNiTqdpFkUoXg3nVLzk0cHB38yVmtCyCtq7jXPt0=; 5:H2XgCa1WSPgV9XYwctJWhuEEIEk68ZixL7rjaEK3XbMnctKlbPaV++ftJ6Dq4i2a+22Z/H47AvAbXGbYPrEs1sVAsSQsuRvSqMEYc93460xTGF0wxWtSsp9JgSHadgtYC6qY1En/w/wgroGVhPJj5gN+tbAWcoxVFFwKzy4xQXc=; 24:eG9Bbw+DAn6YIMc3q4VUnlVN29ncwlKPIwysVbDWletvHWYW8//bSvuYwYCf4JGp7RVEVpYo7sN8P4iLD8+cC/lcqOoKjZuIba30Vb46T0Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1648; 7:0twf/1V683z+amDNY48AK5xJ67AFiM0NMpTgDtFUZi4izMGcjnHjfPZ5uxAQski2MRsN7ClqC/BhAba12AGdw1eLlq/mPPaP0f1eGonFtpYnGikgbGJK39RZFO5DOeNbV1EIfoC7oDkTJQNGHESgFb9bWAe+lW6s7obo/K9jL9c2/WadHSF3Scg8tfRa9yOv5MExDyP6s6EgDHcDf6hGmMCBJjan6/Gdwgl0aPWzvBXOwDlOBqbPoG/7nngAW0Vhb0oj+SwGKa84NXoRpxwlzuVYGORd93zqfI1OvmFjgi6jvUhaatT6EWghDnt5IRpl1My2RyuRo/ZeAwFMFuyVqkPOsxIMpbVTG8kidOCOOk+EsPrqrXIGSU+WrjlwVDgNavcAwlAUgjFu+yXxZAGKr+XFdoNpASSr+u2FlGk0vroiTPD28cacqaQOQDhewzZRgKDjkGbKxbYA8GEa8zVrpA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2017 20:15:47.9651 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0601MB1648 X-OriginatorOrg: netapp.com 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: Anna Schumaker Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index fba6d108179b..e2f5407a66d1 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1313,14 +1313,6 @@ static void nfs4_opendata_put(struct nfs4_opendata *p) kref_put(&p->kref, nfs4_opendata_free); } -static int nfs4_wait_for_completion_rpc_task(struct rpc_task *task) -{ - int ret; - - ret = rpc_wait_for_completion_task(task); - return ret; -} - static bool nfs4_mode_match_open_stateid(struct nfs4_state *state, fmode_t fmode) { @@ -2107,7 +2099,7 @@ static int _nfs4_proc_open_confirm(struct nfs4_opendata *data) task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) return PTR_ERR(task); - status = nfs4_wait_for_completion_rpc_task(task); + status = rpc_wait_for_completion_task(task); if (status != 0) { data->cancelled = 1; smp_wmb(); @@ -2274,7 +2266,7 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover) task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) return PTR_ERR(task); - status = nfs4_wait_for_completion_rpc_task(task); + status = rpc_wait_for_completion_task(task); if (status != 0) { data->cancelled = 1; smp_wmb(); @@ -5791,7 +5783,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co return PTR_ERR(task); if (!issync) goto out; - status = nfs4_wait_for_completion_rpc_task(task); + status = rpc_wait_for_completion_task(task); if (status != 0) goto out; status = data->rpc_status; @@ -6061,7 +6053,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock * status = PTR_ERR(task); if (IS_ERR(task)) goto out; - status = nfs4_wait_for_completion_rpc_task(task); + status = rpc_wait_for_completion_task(task); rpc_put_task(task); out: request->fl_flags = fl_flags; @@ -6290,7 +6282,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) return PTR_ERR(task); - ret = nfs4_wait_for_completion_rpc_task(task); + ret = rpc_wait_for_completion_task(task); if (ret == 0) { ret = data->rpc_status; if (ret) @@ -8358,7 +8350,7 @@ static int nfs41_proc_reclaim_complete(struct nfs_client *clp, status = PTR_ERR(task); goto out; } - status = nfs4_wait_for_completion_rpc_task(task); + status = rpc_wait_for_completion_task(task); if (status == 0) status = task->tk_status; rpc_put_task(task); @@ -8590,7 +8582,7 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout, gfp_t gfp_flags) task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) return ERR_CAST(task); - status = nfs4_wait_for_completion_rpc_task(task); + status = rpc_wait_for_completion_task(task); if (status == 0) { status = nfs4_layoutget_handle_exception(task, lgp, &exception); *timeout = exception.timeout;