From patchwork Fri Apr 7 18:15:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670149 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 C242360364 for ; Fri, 7 Apr 2017 18:16:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB3932862A for ; Fri, 7 Apr 2017 18:16:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B019B28635; Fri, 7 Apr 2017 18:16:24 +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 5A16C2862A for ; Fri, 7 Apr 2017 18:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932127AbdDGSQX (ORCPT ); Fri, 7 Apr 2017 14:16:23 -0400 Received: from mx142.netapp.com ([216.240.21.19]:19461 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933216AbdDGSQI (ORCPT ); Fri, 7 Apr 2017 14:16:08 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="181464046" Received: from hioexcmbx08-prd.hq.netapp.com ([10.122.105.41]) by mx142-out.netapp.com with ESMTP; 07 Apr 2017 11:03:52 -0700 Received: from VMWEXCCAS01-PRD.hq.netapp.com (10.122.105.11) by hioexcmbx08-prd.hq.netapp.com (10.122.105.41) 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=cw1IGzOwhthcB7Ll0JCq4I5FCOVW3USY9oMTIR0rw0g=; b=Mwar0B3nHzSmu0yzX2oyp8b5cHrvsbEJSOsw7KzNsXw6z/xCLnC40bOMT4CdW4pw6oIAA/iOTQkj9kdZu/7LRlNXYk7nQDN+kIh5byFOhs00mPdFWnW3XM/cRbrGAZmiN5Mj45D+le7K0W0XmbsYi/yQ8mIztZ7dxkyuBrY5ZDU= 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 29/34] NFS: Clean up nfs4_proc_get_lease_time() Date: Fri, 7 Apr 2017 14:15:23 -0400 Message-ID: <20170407181528.2832-30-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: f48bbc35-6feb-4912-f295-08d47de22571 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:t8H759Tdb9pY25mdFu9zmQkWhQOptM87hAkxot3OpWIwL8re949ZxMg4yold+fBOyrF2i8aO0LQrn5s66AuIjKr0ApyLuV1eWAzz/lBWm87fbPjBnbNKMMpQqzGPnBsWLpKzmVuuTKLkJO733QZHFu57U8BotPiUWUWR0mUKYMbwnEvlxqnhnK4LMUJE/+RApahd1f2OAWqcjGR0vzwdotXeSqEjB8pIzogOTWepWenvzTL3pb/whjrXvAZW8ihYqcUsjyDVQ9oGEXLqERdLPDpIRXCuvsum4TDrx+Z+s15sIbUP2JT4SO9P2UvUkhgx7VE3V6AtKlv31ZKZGy5bgQ==; 25:ojCElNbSnFnWd5oYXBvERqMPPus/21x4p6UN91WYiiHFWpVdXcVleHmEoogH7RRp4iL61lDxcJKSUszIOfHUxXI6WASl3mjDbxT+mIC80crA8Cu1c6tbEbULQOT0hplMoIUHmcFEe4VTeVu7fiFe66I6O/sPxDtNYwDUwoV3x8TMXphADnfUZmgEcMKmf31UflaOoSd36rxgoNIgy7WGZaXHZa+2LZBtQ0v2QahmXcrgui6hzM2w38bVTB4h4hYjSYvl/0ee2V+s324BN1+gZoBNWn+942z3uFqndkjiYelQNqBOAPERwVm6WZHd2nt9HK0S9eRH+GztoQhgahNei0w5L+0kz8hIYiHgliyMoXyZRLZOtrAxhClpwcccm4vwi4/BxwR39EnJAfWuu51i7aCqlT6ALzHAPy3w/CK31CNbfLgBL8sF+WIax6CE/bPLQCj8TpUNbHvVwuTqfTS8+g== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:yFdgQPZ1BvJiAGEGkFoqJuUDuVCBKxIhek4Fu0yNWttjPYJJXqTcHJWZ81BVMlo5gAQUwkg6l5qGxfKyi3NGWf4vAYdm25nmQy4UWAn50tOitL1XjA2iRkWn5WjJt8nHpsMQ66Z8BoCNh5QwaSAK1wM4OTDohbjHlhyqkSa9xW5eR4LjWzSyr5Zvx+Vn0TAPqT/la6Xr73ae0fu3OtrGPV1debldead7G0GJbLnNZE3eZH6e8Y+W1sOPSwuo4/Ebc6HiiwLvRrpLqscBUZvwBBBSR6j9z8fJlpdmq7PGHBc=; 20:SxQ0SzuIpP532dspCHHD4lsi+MOK+5NtG0a8r16W2UFScN2v0EqTuDF6B39n1JWLDXIvXFZiGxoj2Oxnqn2kpuA5o1BrKLCDqfvNXt9R9p7QlwPJ9+rjRty61vODR6AeZdquJ45a4S/8kyO8psnZ6wwF1TITPYnugkag9Sd1M1GYgycRnXZH+I0k7zVg3nez7PcOsoa/phvm5Q1D/lxI/1R9/fybNddPOZ4hgmq1zb3+7MYUseDKTYQ3Vh3O3WtK8Lx6cO+8KxA2lkiCmrQ6dAwFgBAEawQRtVPdlqK/Z6cfi0GWfSnWQT2ONAz0CSbBFVTsVewF/2bgaSoqd47KgnrmNTpKxClnklnqILfjZxqS4hd0OxZqTqYnDGeNdfBMRmetANI7n4NtLuLBhyhnxEjgEGnfF0iCNK+DOTKoaZoisshcHfkyvxByWcYv69gMJMpS4pgFDtlSpOvoqe6l0P3JVpFpdH8DUdYj7JXJmvOCJ892UA4GXhzmVNSWgGIU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; 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:tA0QQ/8Pmb6CWx8GGZG1AOx9YY221yAohO9RTvKwaQH2Go6dd2EXMlKRytGtTsIjnSTHl4lCRSUUoYhT9Ujh/roOrGUot2quyOO8oM0pAfZmDnLioCHbT5ayPjPuSdZkWo9IMJGkVpbg859zckIpbz/L/zNZxx+grAEuxhuHyFwRTlTaIiAxz5qeYs5sDxWvIZlwpUNTN5Jv0RtKCaARvWnpeepYRB2Cuuc704kJDCc4zmHrIB+fyJ9DLhupSim7i60XvMS4DRjrsKo/VKE8t3PoIdOrD7YhHr3ax2M228kQKaQul/txFNiY5Qk1pFtnES9jGiIqFgUjz6Ji4dvKVG4UNwthHhyPpJp/y8ouLPSU+4fBuubamtgAb44f8IcEN5mLo6tOHjmkLRUYnNDwmyr/nXpMGlJQ41AiEa5eRlpA1/dxSqhU9yHITn638Ez8FBCJcXgot7vrASVKAgihUKgHlqeFsv1kG2ZMT5lrdZtbSuJr3GU+GAoB6hFhLoZ9J5INW4IwDaJsoG+eUvdgj+WUnJSJKhB7r8TIx5hH4T4AjjBnyLfiFCLUSYawondRspSMeiO2WRnKrpoq9RVgHp6rQOoQwxRyCdmK+UhnWOWBmczdHFLtZ6OnBM3CyXkqCGoBYPP8/3VRRT1hHEd6K8cUx4t2VwIzTX5FrfYTWW+tbF3J3d9s8cNDoUhEjxeTh5Ues7yBWzBpqsAn+v4wbgHs6jpNE03vL3xR1ak6WSE= 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:JV7oUWZMXotsB9wvTvWBt/y7LH1QDswUYksgtDz10?= =?us-ascii?Q?lckevHvtcuF/GlRlBxYh6B6QhgThJjS1D5iXgSinQ+C9ohaIu6YXcTmzKxOB?= =?us-ascii?Q?YViEOUBWAaIaXZSawhGaJvaf3+3laURpSoc3ktXF6BLm+AHbIVMrb0IVQf1q?= =?us-ascii?Q?JndoD4Nrl+mruP3m4BsLEkd4mNDPfbdcSbtMgnpsTO4ZPiuNPSembFq3irh1?= =?us-ascii?Q?Ue2XDn3zmH8qg1kJJ9Wy9gyDpRP9QJgfyjboQJT4YPU3tZyCBrBht7avsiyI?= =?us-ascii?Q?s6yG50OKR44LWSqek1d/Yptdp6/YEYI5BFR5GDaK8s+Plzki9w5jjwtgf5TM?= =?us-ascii?Q?phjf3CRrixZHtroNW3Me5HZhmSRLpVl1eYXGohwepUjXd8N6e2w6+H87mnxO?= =?us-ascii?Q?mPZZc6oHbWIH9nwaZc12P2xpZGrt6aBG7KVoeE4SRZGDEKUjaH7+8AQwSIVC?= =?us-ascii?Q?iYP2MbJodHNhSKG5ZEMg2Gm7VzAK6i5fj20+Ar3f2/yA1dGBab7pM4uCNpz2?= =?us-ascii?Q?/ET2gh595fJHDYoBsBpq5SyHSRGA8VutqcbLvCTOWQUWlKwJHG9VEBf4va4x?= =?us-ascii?Q?8fo2HDjEc9nB97wGoJdILPYGXGIdfPg5HZA5XDcfgB65jQLCyO6aHcKfpqR1?= =?us-ascii?Q?S05Hex7anirou8VwOtd7Jmb/KwEbHyrF+RkXTH3MUMVR1tGpFLEfN022Hs0B?= =?us-ascii?Q?dI0IUd6X0uUgpl5XXlPH7UxkvNVZIry0WKAJ4RnD0g1YgsF21311EU5uhlvd?= =?us-ascii?Q?0ynW5q8/BGLXox5Cb9vZo/YyOVK3IaVaqpC6uAOInf9KeFTCmEXhaoTibn8U?= =?us-ascii?Q?gJbjv4hHnVnMX1a2IAh90n58IBrPY+NR8RhTNNEPcHIdCMH2CecdaDprcrul?= =?us-ascii?Q?evh8KM5mV6rlav66qgyKzz2HboQ0bYPKayYhcvfDMSgSdkbxQ8OWgSmhxv90?= =?us-ascii?Q?tAhvauOdE6Nn5BLHUxB/GN576nNYd71qYBjuTUre2F63p7xeXgIDgAec33CL?= =?us-ascii?Q?+8=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:U9Hxq3ui72gPFFV4m2Y9YVMj0B/2ApxukcwSFrr7aSCeSC0WjbGPff6GZJYHxzGnc8i+ffm8XF5vuvqy0625QgFohSmgKLDDtOzkS5I+gdSumV6hMnY8wy70Nf9e0pOFr8QQ5JQWJ9Da0pDYwSzAz9//i+MEPzwlYosLMMDDKDYHpZMPKOG4ugRRRJXsKHnBHlOXRfJ1APCsGb4sknvvAc+t6MfSEdvLCPKESTZ69BgjFi7r2bgNf/TXzg1obXFC1hlYd8cp5lOZg4mejKxOe7HMxoBNuoGLmaO8TT1gQS3Yvs/pXysCwmmaMmHWr08mwCVO/KuKVBeVbUT7RkW/nK5wDWUrKmzdUs7iE7nLgvDlqiZS9L19W1viNoXgpWGczPxqRbnY6h6rdh4EWJxBoj/BCFoTelVpwLWPNqw8qpr60PDmcJmLa3EiwTunaTLjf5s1/Jp37F8nBu+B5kFUOw==; 5:s5njRYI7XpbaGY4vu7LBV1WrsnDpJFEs5PBWyMlLfagbeRcmJF4bMlbSWHuIiSqQa1+p0mvZMcMzKd0PaeoWBqYNwuwN9I2RWPPMpVyID7szOnCkZUIMoftQZe1g9dv31ji8vQZaQpIUXP3LXUjHUQ==; 24:vemo9DUssTbUZyLOY5NrAzwdHazs1ggbuduCzseCGa7tkQtHHvpFMNA4IrxwAbk6w7xuABj/8JQBsvN1J4pOa1Lz+VA3WcBzlCBIkslZpWs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:9QWYMJJpkT8SVI0l4Z8OyN0uSdnaU5s5coa+u/ES5gVDqLoKJeQi6e2ML1DL+kJecqH0E9wX3U6rPgNGK/FC1VyrNT0OBZrlijRkgTqcUae4kZAVEfI8DmwPbAk3ozVeqXFF/+M4PjsX+WEMmS/VStDZSURrC37xX92y4V6b1R6ZzdTNsav/HlVUuzP/gdYatgmUaZRocl6ZfBJkWJMQtGwuQPE2QDvS+G8JY+3qQ9oFRCNrfuKVtn57ei23sLM5PRzFh7ymO+9r1COS4Zq8c38ITkkk1+ndkuiWVvyEQqbxpcimwKfbSk8QBJTzkqogJSK+JfyK28+DYAEO2ydWJQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:16:00.7565 (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 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index a3808826b655..dda19a35ad9e 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7751,17 +7751,13 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo) nfs4_init_sequence(&args.la_seq_args, &res.lr_seq_res, 0); nfs4_set_sequence_privileged(&args.la_seq_args); - dprintk("--> %s\n", __func__); task = rpc_run_task(&task_setup); if (IS_ERR(task)) - status = PTR_ERR(task); - else { - status = task->tk_status; - rpc_put_task(task); - } - dprintk("<-- %s return %d\n", __func__, status); + return PTR_ERR(task); + status = task->tk_status; + rpc_put_task(task); return status; }