From patchwork Tue Jan 17 20:31:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9521861 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 25D146043D for ; Tue, 17 Jan 2017 20:34:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1635C285BD for ; Tue, 17 Jan 2017 20:34:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AA41285C3; Tue, 17 Jan 2017 20:34:11 +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 E9A66285BD for ; Tue, 17 Jan 2017 20:34:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751129AbdAQUeG (ORCPT ); Tue, 17 Jan 2017 15:34:06 -0500 Received: from mx144.netapp.com ([216.240.21.25]:63541 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751166AbdAQUcw (ORCPT ); Tue, 17 Jan 2017 15:32:52 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="171284149" Received: from hioexcmbx03-prd.hq.netapp.com ([10.122.105.36]) by mx144-out.netapp.com with ESMTP; 17 Jan 2017 12:26:25 -0800 Received: from VMWEXCCAS04-PRD.hq.netapp.com (10.122.105.20) by hioexcmbx03-prd.hq.netapp.com (10.122.105.36) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 17 Jan 2017 12:32:26 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS04-PRD.hq.netapp.com (10.122.105.20) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Tue, 17 Jan 2017 12:32:26 -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=yBG3pJsAmRtv6xrplpf72LjKbUPMFazVJo6vRjTGojc=; b=Z7M627gIhCkLPtGJoQcd05qAogs7/lTiBzwZiWB5ZrY+ll3alYxM2oyPv5NZWLP3ZmrOa8BkNt4j5IsqYfiZARm4Bs+eThRl+oWyCgP/26Gb9MdAm8tbOPqpkXxbCmhneCu5DmJl6rYlDp6v+jrhXuXErUxHrt9B3C/g2df9LzQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anna.Schumaker@netapp.com; Received: from gouda.nowheycreamery.com.nowheycreamery.com (68.40.188.1) by SN1PR0601MB1646.namprd06.prod.outlook.com (10.163.203.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 20:32:23 +0000 From: To: Subject: [PATCH v2 03/10] NFS: Remove nfs4_wait_for_completion_rpc_task() Date: Tue, 17 Jan 2017 15:31:58 -0500 Message-ID: <20170117203205.29033-4-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170117203205.29033-1-Anna.Schumaker@Netapp.com> References: <20170117203205.29033-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 X-Originating-IP: [68.40.188.1] X-ClientProxiedBy: MWHPR09CA0042.namprd09.prod.outlook.com (10.173.46.156) To SN1PR0601MB1646.namprd06.prod.outlook.com (10.163.203.140) X-MS-Office365-Filtering-Correlation-Id: a2fbabe8-6644-4563-4322-08d43f17f205 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:Bh/i0xQIl/xRFDS6U80OaYqRPd4sp5dJSajNg0gXpiu3Zd3cl8ypvQ/vrjYC8wOW8XQlGXonkXOc9OoUL+O2vzW7ZsCSrro7kEDN5cUQ7RFhtyz/IjqOAZXcL6MpMTmiMV3fIWpggAx6s3pecUCahcj2hTrYzGPWgWB+53lmlRTbLmXgIzN+UDf5Ay+8ah1r30L1JKSDbYPjSUkmwsEN7AxlnZ8uRMoJ98s5Bnl8CzXD9vqAJtflWgTmb0ykx4HRndqgGrBrlGZ4HJ5nnN/zUQ==; 25:zPfkuGNmWQ+W8z5sYAf426alGCorBgrgs6Om3I7O3MO4F8eqOJgLq2+SQb/noHO2Jbef2UObxN4O6qohWA70q2EbK1i+7mH2+7JBGXq+in4khszLuVds6W911nIbKJtHjmvDpPwsW0761qohuLL+8nWmCKJqg88nIYMNTiTqkkm7TtcONIOLyv/0j54CJcN7ULCL18qFu3xyvIfST9pjVwAmCxspZ/MpBXG9Qku8afMGvnOXH1D8JoVx5HnydCLN0/zm2l1XjYMKuWRTIYbkwp160VLzOOZtaNHEzx8xjkuQc4B5DV/43E6b61vBdbq3L+WxgHG8nTQdpJo7ZW3pFv2iKku5OZk3UZGUUTMPx9oel66MeNeVVQpuZ4oB7ZOcgJ0sg24XjarITUzcEAjlK9naagN7EiAtWEio8oVj3IlXqp4bWbGALL+6IEky4Fv8RvimIPdvAsVHXEw3LXkPqg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:yQCQyXELZ26Ok/QiSx6PuCi2sU9fVjPK/3+cFhG9cFeJN0vouzXtzpgALcsyDHFD/0TKCMejUXOy2IuknOqV0SP7YyTnLq3JJO7tFG+UMlNih2Sce84Uwp2/amIInLXjQ7zX3CD3ktZAF+eFPne7cTP7Kf9JenvobxaTx8UTBnVLYHth5VhCt4sfUlfQV8ejKRrcXpg4QM3Sw01Cnctt6Cr9y0Rxc3dEXmSAAaH9IokOYkx3YQf8ytzsinPeAxLKKXhYfOGoXo5ZpDcbdKruDw==; 20:L6yCDfqglNlnWX2zl52G3kfzWwyQYxUAP+TEsWIiUH/k88sxzVpKj91ykD36Q1659/lDnAVW+iiKR0SUc37c7Rq4AeUC3zq1hXITAekeOnRs+XRANNxdSt5pfDcyJkIlmzMAUVpfu/TQAUw6pPkv1fCBbZ3eq26vNI1DN56emJgKfQF/QD5Oty04exJCa2VuFT2htZ0KcFg5YnNOMLKjJ9fgfrjSx3FYk3CJe77PyIF+sV5AphHJgqcklws8+htNDuRx5Mxz7qYhO2frX6l1emrqdhM6GN19kBllTUF9MiOgNBiFdsc/vb5+8pcKm6KqiB7585l3YANNgs8g+xNlvk9jjBZtlkPZD1Y2NxtqVN2iIk9L2H9P+wkcpL627cil4O2DfGFXtod8cDd1XAM/ox2pCy44vmH0DKczw8gEjsr6qA13MMcnK2Jegg6oZMUINL7LMNHhboWBhpZihFJr4jh3LNLK2+4bl9nhFPgQZAfmiqRORICQX2baMvYZTo8P 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)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148); SRVR:SN1PR0601MB1646; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 4:gC0UyjfPjYc3wPMjqgwc4/gq89940yMYHfUkWsQVAWUpyMlwUw3pQpTUiJvBv6V0Ebz7drH85yEGY71UcsvWoC80dbaa66MBTS1qZZCQLiRAQ75oPvb3HkUsnqCG1d1MmW2Ii4Ejn6BEp82MJJZSQ1rEvrvjqBf1m86kkkgU5+qOsst01xHK0I3Ny/NKUjHCqQhccEUxMhmgijGiDY8PXBhBIzU7AcEmh/ztnn5s1ds+jYj8Rv+64jIGTK7s8ouYTbLcO7XW+zM5g1HgNDvj1iwYMgq4lih6Q07b/7Ij1oasKz2nbyuMqgHZoGhYHKTP26O9Ix78CfaqexGApoYK+rhb6/jsDAAifhUiADzKsIdIiIRtisbafkQVfnyqif8xxNjyBwFgrEM62MdJIfBKUnDFmGKhqGyeLxRI82hUNl/79aTnbTN7z6TTiIN1OHa0Styv1TyibjYEumREvDz5aUOAn+EoT/ZV4TVs+7CV8lcpeTd7d3ZTDdBlCufWQ+8bXKHuNUENnt2JVLGVpksCVom5Bws5wpbimdsszyTiItlfbZS2F/pA4qhy6p6rrCpOpYIOVEp7dN0WkRVmxP6KKA== X-Forefront-PRVS: 01901B3451 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(189002)(199003)(50226002)(107886002)(81166006)(97736004)(8676002)(81156014)(6916009)(6666003)(305945005)(7736002)(92566002)(105586002)(36756003)(1076002)(53936002)(2351001)(68736007)(48376002)(6512007)(106356001)(42186005)(86362001)(50466002)(47776003)(110136003)(5660300001)(6116002)(189998001)(450100001)(2950100002)(6506006)(6486002)(76176999)(38730400001)(50986999)(2906002)(5003940100001)(3846002)(66066001)(101416001)(2876002)(25786008)(86152003)(15760500002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0601MB1646; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; SN1PR0601MB1646; 23:Dbqy4+N6CZr3i8WBAgdignyIn57gJlCsOMdtWsW?= =?us-ascii?Q?GblE12cAOLOmK6GF/NcYYE4yoeOWuQWLdFyAZbtfqvmGLhC8DcOOGpD4i1s4?= =?us-ascii?Q?mzFqk9pGgO2U5m64sxyIf0f565/lmPpS5AgqLakstRvKnf4WU5JUIjSgzhHj?= =?us-ascii?Q?hPK5RRuVuj5f6+4x22jnVRRqs5WEiwUORN9uG5vzRvANdeDRxSByASlisEGY?= =?us-ascii?Q?sw7s6YDuFONAjOamjKMebVCTR67uAZmsw0KCtI4sBWXktLsfSBxxJ+HOmmoU?= =?us-ascii?Q?2KDlIruUpTeeBIa52cEjN9+L4OLkoSlo0IdlRORoFvnLeF9zdNOcA32TXTVZ?= =?us-ascii?Q?/bNCwVIGBs61FD+fL2L8J4SaJbslK/nlBjU12RZPoxA9QvcyWGTOBTP8dgv2?= =?us-ascii?Q?6+pI2/+cFHOTjYeawBLAYfFZa4nPRKQypOoH/OO+U7e87T1a/zN47Kxe/rrV?= =?us-ascii?Q?DRb4/HgT/RNzJt87NNwK7JSCrMN9yQkFIxFnslHI46/UV7x7LGHI8s5mIcLS?= =?us-ascii?Q?DPDSLtphgpv5lG1TWEe7Rq4dGoD/aDw3O9JR1pgMTHbE99uphwnGBQPxENog?= =?us-ascii?Q?ah+VvziatYClgzTjPk7aHpyP8RQoqMJevI5qOnxvbXqtZXXU8bxzFDPbcoNB?= =?us-ascii?Q?XaOfHPnk6/prWEF2+yZrNWfhSCKNUlxZy8+ALRFRFDteheK+9ClLSFvNzCrO?= =?us-ascii?Q?BF6Y+NxXVTL5p7gjBKRBBNH5YjGfO9bKKpznMuDOg3T5KANRa5HQCj1m7f7l?= =?us-ascii?Q?UY4wwbSRseRfP1Dt31R/NxUKBdpkSv32XXOmWaVi4ouxaqcA3dUIJLfbXzbH?= =?us-ascii?Q?ocEh45a2ipwoS21/8jI4ln3cBpppRn6jKPrguYFXI/mYwm7IwH+uFN5ZgD+k?= =?us-ascii?Q?GNXPBe13jDTE/hMK2w0Uh+WdeHni4LtDTa8qQ1BrNCk+t0gVNMk3KKMxA9oo?= =?us-ascii?Q?sOxiECMNRWTE1kpntdo+wHbnAleuEjSrJxqbbHWHsPWPxgPirJaJAhHb5B5L?= =?us-ascii?Q?yvb7aCeh72ExwYVdv6gRFtVpzHAWITBo5TbfnTpHZVujlQ4GYGKYMFwkP0bb?= =?us-ascii?Q?qst4aYolOmBj8QjIwUyCVM9tK1LYh/OY1eD78MQkzQitjjty/tqwt4wM4Ppc?= =?us-ascii?Q?Js0eMeB16bFHNY6i5qldomI/1kYIIMK4aT7KoXYOfvnCCY3KKGOxLx9QwrbJ?= =?us-ascii?Q?CkXbcKd4rbNgfrzc7aSrESJziRSFRsOIyQ5M7?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:80rl+rQ1Enunn8gnNmWdCRuU5Hj8fwQcR9SKF4o6HXXsi0Yw7FEJWyJ7ltfLfd5ugWeKFmj9wbfeo9dIvbDq5vgaYRP+7Qf8DvJV/AwvoWsTpO6Zk0g2jHP2Pe15ioA1oD8JsDY9Dw+wBnIdChZG/sNMV3G7ZkDRE9Ke2BerwB7iPE7OHjG6BNPwzSdpBKV//SmCvL9w+UtOGjL7o0Vx0tr3IrUvTlCp6QkdRR5IarsA0oIvWMGN3EQhiuT4z+hq4vHwYqCbf5w+1ZeoHmZF5tt9aGvOeCH5V3lka+7CVlsgypf3T+ahQR8MH2B/wZQKXs/YIMDMU4EIo+/sbJEM+NihX4RGIq3dE9ztot1WBuLXMxPcNEKt1wiysp9rASeFLesLdbmpd7JtuXwTCI1x3ku06y0IQ8lfouv+YkF8j8g=; 5:6P9zVSQMXkxTiCsvPkCm3OfVs0Ks8kb7kxsK7fpnOpE8qxDSrsQWWPmy2js6Wh7xe5OaaS1uZUydFqsiYANvh5SVRewKXPQFgfza41aYOxfSe3yeXsl6Qdhg1hdW7jaMqoRnEonEErOS43QF+WECVA==; 24:zH4UhNM3D6porDSzQdtbAj62w1Qg8WT3o9cjDZb648Cs1TcSLV8NpE/5b/0aIpSjSK8gTVcQ/PZma/CZ7bfwJy7wBixcET+lY4/dmWBSWPs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:s3Vttvq81QrgiroAfnxtZvr9nljw/XKgGJ33iQD85rCKimSPnwhHY+/k+7IUdN0tDJS0yuWyukio8AdvWZfnZzwx2gk/cilUYDWApVFmvJIf8yagt7Uk4BZfzlTjN/ma4x5nJJcWv0djCSTNxjsmLKDyyQ48v4XtHromBdUGCxfY1itAnCMAAJYIWlrfmiX6fT5tw2a0iqy6S6o7f4cGEk/k4SDWxZsmpiYRq+W/t+r8VLhTNmgVduqFoyzxE+xFvc+3Gcj7lS38NUFrRU+x3MXz2l4JNMk8kk2X2hpGignx7hO/Uuo2oZH2f08MN1hXRZ1sEvaY++wKa4zSptnplR3VRQ8VQmfqfnGzacpSpbL4ThNiXQhLFyJoZgQjkZrHPkD1iwF7X8FigBu4tIyDxceDYAKeCWpUjZIuiWwOMNWR//4qlvWGA92BxMuq6ClR6p07867HUN/yWXy1hVt41A== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:23.9818 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0601MB1646 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 00cb8b6c2c70..950e9cd15e5d 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1244,14 +1244,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) { @@ -2038,7 +2030,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(); @@ -2205,7 +2197,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(); @@ -5722,7 +5714,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; @@ -5992,7 +5984,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; @@ -6221,7 +6213,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) @@ -8289,7 +8281,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); @@ -8520,7 +8512,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;