From patchwork Fri Apr 7 18:15:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670139 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 DB25C60364 for ; Fri, 7 Apr 2017 18:16:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D456C28635 for ; Fri, 7 Apr 2017 18:16:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C94BD28639; Fri, 7 Apr 2017 18:16:20 +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 E8A4828635 for ; Fri, 7 Apr 2017 18:16:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932800AbdDGSQS (ORCPT ); Fri, 7 Apr 2017 14:16:18 -0400 Received: from mx141.netapp.com ([216.240.21.12]:26541 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754489AbdDGSQE (ORCPT ); Fri, 7 Apr 2017 14:16:04 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="194559167" Received: from hioexcmbx07-prd.hq.netapp.com ([10.122.105.40]) by mx141-out.netapp.com with ESMTP; 07 Apr 2017 11:04:35 -0700 Received: from VMWEXCCAS01-PRD.hq.netapp.com (10.122.105.11) by hioexcmbx07-prd.hq.netapp.com (10.122.105.40) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 7 Apr 2017 11:16:01 -0700 Received: from NAM02-BL2-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; Fri, 7 Apr 2017 11:16:01 -0700 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=QHGDnz+c9a850veIs9Ho20xJX0ZXRl2+rLwGrJMW+bc=; b=jvPYmdmE+QPFSjpsoHQ2I8nYmK0NtLAe14Zf7oWipUNZRUFD0mjG013GsoHyoNx7vFe/YRQXQY3oTyseMF+RgGtWuN6B2J8quRE5c6JJRqNozsJtuGqRJcbV6OEI8qoLm7rUfAZ9UO70aBe/9nUh4vwiR8m8oWklt5hDuKMrw/Y= Authentication-Results: primarydata.com; dkim=none (message not signed) header.d=none; primarydata.com; dmarc=none action=none header.from=Netapp.com; Received: from gouda.nowheycreamery.com.nowheycreamery.com (68.40.188.1) by CY4PR06MB2472.namprd06.prod.outlook.com (10.169.186.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Fri, 7 Apr 2017 18:16:00 +0000 From: To: , Subject: [PATCH 28/34] NFS: Clean up _nfs4_proc_exchange_id() Date: Fri, 7 Apr 2017 14:15:22 -0400 Message-ID: <20170407181528.2832-29-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170407181528.2832-1-Anna.Schumaker@Netapp.com> References: <20170407181528.2832-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 X-Originating-IP: [68.40.188.1] X-ClientProxiedBy: DM5PR20CA0021.namprd20.prod.outlook.com (10.173.136.159) To CY4PR06MB2472.namprd06.prod.outlook.com (10.169.186.140) X-MS-Office365-Filtering-Correlation-Id: e0e132e0-029f-4331-3a92-08d47de22503 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:iVsZ7w1+KuTG9cSoLBJo7LMQswqahS6ncXbIkM251xqS9t7Zy0RkvEyRcq0E2RmLbCrxih3Mg1d/h6bWIAzDi8wfPAPtm9UPErvzmTcmlOyBgYoAX1sklVNJNxqfb5XMMj0Wiq1oOqiVBk2uyeUuOM4zO1diMxxp/KFcxRM15cHdmPuypUQ/ZK302t6GlNHnbsKsCWLpogSsxtavYM9GuUkyShcYviyauyP6TagdFNDTYsza5ZCiCV0ws6ni4b7QQIwGgEJPL3uT/3wQ/XQ8KTRkrWm1sr1c+WYUIdUqRsRqu+Q89DfbSrBcIYC97wni3ui7Pjm4k1GNy4U+gLexog==; 25:ot3NjxURLdz1FL4qTCU4ySgg5HUd/bdklJCqKTxEhjvTFJkwPvyB+iaT0DOg5W6koZlgvCWtTduy8A3XnmGwAyuqqpj6Y9IG3A5BlqCTbxzb8vk5H1iyuzZARuEszZ5dJCPDh01p9R1jc2xD4U5o44JdJ+x/FlyUJKBMzMPurSJX+Xu606m8+atH3puGZoDnJeqyQlIcy7xn6KmQDsW5siSQXu5BvYUXinkSwjLfTUMJkYcK96GoRyM9sWHI7QLFvADVhUYvGvPDGydm1FL1gkPCJCS4lqoUQ/LHFVfX/D5hdQjMdB8Y7GIBMaaGtA9um+3z9Yei59FNywm0d2URgSQlB0Hd+sg2QleGNo/ARIFTqiTR2HOwGR0sjqVXQpgS24M/MbdG04/utMCrF33TL4YIp/hnijYQMvZav/g219X8bDX+EJHM1mF3jc7jquxPNKOXSO11I6l2VV0rXPOr9Q== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:YLTgkAbb23cR/QifS6DqcwoNnKEwm5DlQeVHE9GSCy4Ahqz8ziTvwhja/jW8d/2Ybf+3YMpGDVr3DZ0SXLwjIPjNdKXKW89DWjnpvHEOkL7vrJnv5kww0+pRlzM6GlvYcPn4SqlAs0mmtEiayHsXEaH0LVOB1JfKpdjXQvuiFcVe5cGVpJZ/uaIiI4uucBE/MDbzwVR95UeKjRxkb3RRg6+5goRIeQ5iJ/RGuDxuZk7NUmB0PfEIX0+zE/a6BaRH3bk4tyj6CvCa1VXP+UiMomF8rowzR+l7lfXY0rUU8gg=; 20:C+bCsw8F3FDa8+u3pSefkBLOt7iAXt0oWRR3EW2XNza1SoN3obGA2FDDIU0C0Oh1OJfKwR8ssjIXpofk9SV5xS/n+Zk3YjqzvEm9ser4i2vjvzQK0BcuyDXIBibB+Ioytyr+OV34Ez29sq2Rlb+K9sI5zN73alTfdRDHnmTAMShLqVuaKz5WepcXJUw9T8K6QScf2gt3XHTz/wnZUbAGA2xDvGjI+jhPs5NidcEj7kl5BPbqKOW8PtVrlPJAg6ctED1Ri3TmMLlPGnjC4Ut6fFUmpCSr6f1eC+zauuEy8yBDPny0mBLdJcGLbdMWCsvCesNkVZyItrgu65QVyhoqUzTHnmSTD4U8anhEJebVVdUQ+5i/ofT3K08kQTZlw1WvwZeiM7ESlZ0jXeNXcIa36tn61NEdZord8ezsn4SMM1VVPV+vOmQyKgw+eZpEsvWSq/eXoyYXvFqpdviajhKwz7YT72Qg+fNRv7XkIl6ERzr0hMmWRaqtghqcUA/nyzKg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(158342451672863); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(20161123560025)(20161123564025)(20161123555025)(6072148); SRVR:CY4PR06MB2472; BCL:0; PCL:0; RULEID:; SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 4:76njtAhC71K1UsEvq0tERAPF6DdMj/oMHnqmkrBIoLp99V57O7je1Jz9SCBYQLFE57hTiG8wl0npWdBy/2PbRjGQe9S3ATvsqggeq6iUb9AqmememsSCXeBZbNZYtSzwOtXRnktG9nKG+zs9zXy2+WQVwTDUhSeQujdUwGn7w5YJ/XhJYDRDjFf19mOGXFoDaPXkmyqKZTm/v44BikGUoyZhHdMVEZyi4g3Pvi3Rr5peVUzsQdsRl92lyQLrsAVFyMLYHr4k7cNESH7ZWP6sHv01T52QopuM91B8oKRkPV6AxvSVbUgJwvc5uVeAJc0gT8FSrnCBfYSbFan/4auBsXSz0aJ3kDPtN5qKZ8mn4OLT2CGl46vICmG/zER+Z9YSN48YaWnmWYLfbztHi5ir/GP/mHZyqqHWoBnndoTLtr83YOfnARD0bI3l23vE4zHJ3ps0MlW9vcN1XJVMRgDEzVcD4Su+2XHqT7BAcXFX44jKYamZ0Gw+dxtzMh8ZmXVZF31Dnh1BMpmo7Scs5nLLsZwqaad1UaJ97xZliiE2aB46dJ7dKixpNXtum3KOvGAb9m/QzykT/TUrCJ1y3SzkDzbFuNBlvEbVaoPObvequnjli8E5i1gbxv+enJ8BAWVw3E5vIFM1QmBD0Ur1g0PL3rX+cx/wVZDJS9FfBxdjI8Okmw/uaksHvg5ab93k0ETLgjWc6BQEEIMocSLzZ69CKvOJhK+IgfUXAMHoTgyywBKK4A+3ke49ILIZ6LECLrJwHn7rvXn2wAaFrKQoREgFTQ== X-Forefront-PRVS: 0270ED2845 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(39450400003)(305945005)(189998001)(2950100002)(5003940100001)(6666003)(7736002)(86152003)(6512007)(2876002)(6506006)(6486002)(36756003)(5660300001)(53936002)(25786009)(38730400002)(76176999)(50466002)(81166006)(8676002)(50226002)(1076002)(6116002)(66066001)(42186005)(2906002)(50986999)(47776003)(86362001)(3846002)(15760500002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR06MB2472; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR06MB2472; 23:STTnQdd9Jy6tAQPTV6hAUafHwvb3EDqLuajEx2xsM?= =?us-ascii?Q?46kySc8HAnRp0GSyHwY//y3Y9Z3gBKA46O5bjAGe1QupC6lhiW8/IY/OQsde?= =?us-ascii?Q?Z70fTgjRRZjaAvdrxTRPcfP71xyt0GvezqlaVdF1T98hAaGt8c5MQ7I4GMtO?= =?us-ascii?Q?63wI2TNaXIltKzPYRIE+YcsTmA6ossUuaDAtCsmYTFYdZ/EDxJJVF4i2jDhF?= =?us-ascii?Q?KN9Np+9LvOcbQdwFRwvoP69521QNNCPAqd+9/y2KiJTeKWuFh8C/R9Av+57A?= =?us-ascii?Q?GLJTih79ccYL6x/UkD0EwTWHpPOyAaCHbCbk+HYyJ+C70g1z7dj6iWnvsNeK?= =?us-ascii?Q?uJs7ZVMGiqBjguHdPvvu3YKPmthqoIJb1N0pqwYZdNFtdQUpMWNNW3sc2BqV?= =?us-ascii?Q?+TvZCXdftFm5LXwQcq3pkS1oX2cmVgazLPhHT2EjFGeFUho82nO6MigNfxLd?= =?us-ascii?Q?nl9kYzZyFnGcOqib1dw+G3qCJ8aBg07gWLAGXfvWqQWc0hzx536E0PttSzVI?= =?us-ascii?Q?sDt4h+E1vnsLR4B3nmATofUd/tEc6V36MDiZ67iKR+jHcS5A9kj9zqSJbPw6?= =?us-ascii?Q?YPuDBuh5qj91cTAW1i+tlLOmVK8itoHnpEV2Brxkcd04Vh3jsdrU7jLb2t1o?= =?us-ascii?Q?kecAbxi6A6N2hjQT/TdrmPIZPQTLjoVXicTujmlOeV+OOmhQ04pJkRKBpRiD?= =?us-ascii?Q?4fx6tg77HFimEDbqM305vZrGVUtCKlL0hJf//yrCU44/yoPGcR3UOQbj4x3y?= =?us-ascii?Q?BJm+DpJvYQjOe4fhuZaJTu9hS/r2bSV0mfyJ6BNazde9dM7L2AKI2n7V8v0T?= =?us-ascii?Q?8k5d8H96ChnZhOMC07VrjPzSjSYjcFXTSQ2S4rntXQmdFNfEOAHTfSw9w55+?= =?us-ascii?Q?41XdN2ZCsed0m/jlI75ZOA/DqgUR0u8JzlYWTE0ywNuZ7z96vhxOSr/KvsEG?= =?us-ascii?Q?Ss6vfHV2hGCSWTZ6ZEMCy+ZiL3qCbcxirNWPkz9Mof107L++dTSWX91CRyg4?= =?us-ascii?Q?x4=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:aZiuu4I9QIk7ZV6xB5f9x+6HyYNKCrGAiwFBegA3JFGp+SkBHRWp7aghTd+mfFYNGJaXWYzTclHlPeKfSnP9Jc7K43TdfPE3fOrtpp5r82PtUAuEsnxeMCspBZdfgmYhNCQCQlMF26Xz38P/iZ4T6TNmMQmzwAmmS68y5wp82NwHHeJJD/zcUcFKHsjr8TE0WODV9I3fw2RMQRQKWu7y6cS1vrbeFXSYHeip4I5RQdW1RNZ80WlnjJn0mq1TWim2weiDM3MgRoE9OlrfooRqlm8j4MUFxR+Bkj9BiuNc4g4dDYXWUvp1E7qS8hlXl1KKRXjZn2P2KTMey/XggVBkKOtdtYCNyePIK5vYYyfuO+rEwLC6/uuMHCdp3quzOAr/StDoGQ6VrwKHkjwIZ9ubpSyR4CpmLu01sNO9KPp2aEUWVtvXGfdRMHzbH97y1iKeEHmbbNyPfx8busThn9CHug==; 5:8t6GZzGIP6Ua4Eu40G3AuS1bcLobVvIvyrH1hToNcC2rcn0li70xfmzHP6a5fibUSG7J41jsT0eo9CyzgiGqls5jtoKEKbY00nYYGPOxGS7VjoCar5WIhlL8/aXJxXsNDnrLHcJUbUxm5hp+qbC2zw==; 24:lenkKtmENjds00j04bi8ztUQ+iG9HGnvTOyx/mw+QPNi0/SLHQKRUaxLh987eKqiSMdq+oBhJEw/uHNbXxUxfXXbFELyUGiMlvEV7J2rMaQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:cMK6H2Wp41ZpNSZHeYaZcfnIhgyTlaalirkuF59/WiXkxx5pWEVtNo4A5LdPxlxr3fnz09C+v57o93zeucYnYkPWfSScrBVjz9+5a+dxxBNZnjX1rUWBfyfxmEkXsSUa9kOte8sFO+NuS1ub0VWWpfDDNC5n0oNctcoC1AfWtaQKG5xDFpUyJqoHLSuUhSRbajc2Ol5+IDWUhL902gKJLBxgUK0x0c+6qVVqLUIyM0R5HPqGWqOhOzqnOI5v+KKeCRSTECsFlHEuEeYGVd++2doQq8AWNfcve4ytJFXPQiXJlq4kpW6C3yeAV4ewXZPADYqmt+wQiNFUwyXPK2gjeQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:16:00.0319 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR06MB2472 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 | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 184d57a5098d..a3808826b655 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7453,15 +7453,14 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred, }; struct nfs41_exchange_id_data *calldata; struct rpc_task *task; - int status = -EIO; + int status; if (!atomic_inc_not_zero(&clp->cl_count)) - goto out; + return -EIO; - status = -ENOMEM; calldata = kzalloc(sizeof(*calldata), GFP_NOFS); if (!calldata) - goto out; + return -ENOMEM; if (!xprt) nfs4_init_boot_verifier(clp, &verifier); @@ -7470,10 +7469,6 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred, if (status) goto out_calldata; - dprintk("NFS call exchange_id auth=%s, '%s'\n", - clp->cl_rpcclient->cl_auth->au_ops->au_name, - clp->cl_owner_id); - calldata->res.server_owner = kzalloc(sizeof(struct nfs41_server_owner), GFP_NOFS); status = -ENOMEM; @@ -7539,13 +7534,6 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred, rpc_put_task(task); out: - if (clp->cl_implid != NULL) - dprintk("NFS reply exchange_id: Server Implementation ID: " - "domain: %s, name: %s, date: %llu,%u\n", - clp->cl_implid->domain, clp->cl_implid->name, - clp->cl_implid->date.seconds, - clp->cl_implid->date.nseconds); - dprintk("NFS reply exchange_id: %d\n", status); return status; out_impl_id: