From patchwork Tue Jan 17 20:32:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9521873 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 B41CF6020A for ; Tue, 17 Jan 2017 20:34:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A56E6285BC for ; Tue, 17 Jan 2017 20:34:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A27E285C2; Tue, 17 Jan 2017 20:34:29 +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 1DE2D285BC for ; Tue, 17 Jan 2017 20:34:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751164AbdAQUeK (ORCPT ); Tue, 17 Jan 2017 15:34:10 -0500 Received: from mx141.netapp.com ([216.240.21.12]:11763 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751171AbdAQUcw (ORCPT ); Tue, 17 Jan 2017 15:32:52 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="177298219" Received: from hioexcmbx05-prd.hq.netapp.com ([10.122.105.38]) by mx141-out.netapp.com with ESMTP; 17 Jan 2017 12:27:19 -0800 Received: from VMWEXCCAS04-PRD.hq.netapp.com (10.122.105.20) by hioexcmbx05-prd.hq.netapp.com (10.122.105.38) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 17 Jan 2017 12:32:27 -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:27 -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=IpQr5jj4UCZfTs8ooyw+eH5Y+/t5B5b73jg72uiOBwE=; b=XzCoKIyckxHI389uZuBFXrz5F/mX+/vv8tJ7bRAG1sJ3k7XuCVGxSENPJBmByfOxmm7aWP070YFpboRbF+9A1YSRs5XaDwClg6lwaOQFI+crOlmSm5ZPT6/OEqZ0oyFOfzx0DkQGzFJTfu3epfxB5be7O/OTCt0K8v+pr8ul5J0= 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:25 +0000 From: To: Subject: [PATCH v2 05/10] NFS: Remove an extra if in _nfs4_recover_proc_open() Date: Tue, 17 Jan 2017 15:32:00 -0500 Message-ID: <20170117203205.29033-6-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: 45ab6d8e-764f-4b1f-87be-08d43f17f2f1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:7GltykvPf6JhJIYq/ny6p2rxxdOVSGu34ixaHvlDe6wcHApQ0ztHIpSO01Am2xS34Uxgq6mlpyHIdGHq5dpLp0UDzgfkeBH2nowAdWWt5n4Q4tL5uXvUg/t4/Shdz/WXkpFc8WwEyXLdVyZL0nWy3rtTbXyf5duIZB0bud4VBxTGZ2AEammRt55pkhWXhQppXP+Irymsxl5uKNtJAcAKGViZwI8pPl7Krb2/MFD8ZYsCHR7ZVML/eiBP9Sqw0jBegipIgNS7b8EirOctxNXhmg==; 25:zQHcOTtvovvcxEDWxR81n8Q2jJxxVHlZ8QY66SEMTl3mjrNlzf6BQg34SNWr0GGOnPCtS/U/rmyPqVUSEkXvYk3nSbC7QU8PIhYa6TL+rSwaYMprudicViM0y6yk07xfa4sPdu6ZI0GufOIIQaTY+tG5jQJKQ9gzylW/AG6zsaEQNJVY+Yiudthf22yplibAxnKvrVM07DaJAPqkdjzROryNtgkmITT5z9GnSURseoQTrm2PWEzHdb0U+O+8UYfAlAd2gWbyXaeEv6NzATMZhBHQvUIcqouHuTDSEPtlyxD77qq+GuqDL8K6wSE0x2u8hEUxyr5Nq19fVeakrTXYmMiR8Xb+NccRH2t3BdXk6SnOgT34OIwCiyMbaovxHU4D3syek7/gCwMbQo0Hz2eLuQI3Yt+c0vP0KF9TtxCVfxuiiYGEUQ0jmZLtPlg/yxO/0t2jrXYuXNqophK80iOERg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:ZLKFxiqAePdgPIEF50rEUQ9znod6EvNGYfeKwJghoHoRFgtxDO06lbHhu4tbquBjd58d7RjGs0L6TZnwkjeDFBktOPCtoSseB0hIB03UkspBR7NBngcTWyM3pIR87FzZRU8reQqcqJScgiYlkv/Px2+LZifNkSPAK+sjX+xwvylFJ8qrnfpnelnTeOjRoZSt5J4JW2dSjPsFTnmsyRapgEA6b/BdxSs+X+4CCPRe/uHUB+o6RnW7N83ox1OJcsmaZ9ftUL3K+6H6ckeomS/F+A==; 20:S/kQEEp1RwGM5aSTE1d6Kzs+QLC1hQqVXqhEJH9l7JSlcMUreh9TB8Qks5llnA96idG78/1eY8YySP65q/e1P71EoIwqmKx+tZBBGFx8UD44mR7xzoWlmodvI9jB5vXI1JP+TG0812W6LN+6ijHx/8U6OM3cDhamAfczUpN4sWY4kxeqKBkU7RnFYPxTZXnDx/51kXG21ktKzv2Yzj80ljIVIktOCNj4nTytChgpClmRaSLiDUR3g+zJ2B/wfwXYWHOX1Aie1ELrghnsUbfDAao0UT+ob08xcRuDFBblHKbldz1djj/vUASGLy+EHOGkYJOKnumKrfqEBr6QDet+sz0ngz2c4DcT/1S1Z96d+5p4lUs2K3lUT1AaPuUp31yL3TEqjxJU0XxZmfppJGTMcWOZsw0i4qIo0k+2WBGtpSLVzESJxQfL+evGg+U3UPc2NbehognZN0SwA70aq+AV3VRj315JYQKSW+miC0q960KySmC+CFo/XK9V2EBKMtUL 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:er5VmydRFcxdapimAV4Nq9cmID2x/GxXtfcd/gmoIK9mpH+EQCTineFkeCB1KMZZ+C/cDms9gULo6n3jPl5YmZ7O2i+B1CS20H8uj662bxm3AifreWDljqfeRLZl47xVcozC3MsTbsPaHzx9jZ564AXUDhAXcmz2zVRBdb9KfxlWc7cBebG+FW0+n/PzLY5Qm9wiZuwL1JE9WrNmBBHr603WNuGBUjpdz1wRf3pLn+BQpgpq/LOGqg7ObhmQzGXWfE7BjXlCadVVK+8m4Ef0HTIthgsPsLbcjUN8ZKqVmQ/ANdjXj89NawQt5X/doGj9W1WPSF7U8ghAxdkkhbMIJ093GiVgM1ivAsoKm0f3uZiYccA19SCiuOHOuCqPziC0EYsrl208eqQo2z8W1RbRvRGQE22vRiG+9Sl1qLgFz9rC9NgZjNiXzH2RC32ke0rF8LLIFrgeli5iMr9xZIGmsgdy7FUu3S9uwUNFLsUcbpstQCZSdvbMQyYAPbLaGyqWbJeud8qnEHorEhYp40bS+UEuBx6m4RTlyt3BdYK5ewsmOaTG3Fwm8ULOk7Nq57CxrUPEZwBLSrSgx0PvlzPwqQ== 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:rm/kexTpLA51NBSuK0Qr0gJp85yw7ikmlcEl7Dm?= =?us-ascii?Q?cYsbpiyz6NdbFD0/suCVVKQMhpKuIcVSL7WN3ps5QB3qHMKqRGH6C3yrdtvk?= =?us-ascii?Q?hxn5aV42ni8xnZbOuiN/5NHNPv+1bqYhOlKMI+zdKslFzAZxvy2RLGOheSGr?= =?us-ascii?Q?8Tgh0MVRzE2gmq1l/Du5Sq3eTrrdWSmvWteSpk4J5Lkph+NooSYg1cfhEmCX?= =?us-ascii?Q?QrtPH8j+KBf9Vb+MTMjBCmrQqyNcRN06wMyKd4ry3KVBGmkLS8IhkuwDa8qm?= =?us-ascii?Q?0Foh5kpAnFPRNH6z1H1a8SfeYF2scd1g7AQ+jEV3VvCi/fn+SafDHsthw9ZV?= =?us-ascii?Q?iFV+HBFgQ8WRLXfOJqHU/Ics3GNVyZSobRHN5Tuj1xOu+2YFqtObkTkuWJx3?= =?us-ascii?Q?3oUHsIi187LLaeqoOU0vePHki3DhbITxe8NasMbDn4IhuZJQAf/Snf5HxOdW?= =?us-ascii?Q?hR09fRRf6iav8K+Mk/cMuogNetNoSGjNGcDlHiM46rNO2p569/2aqxfQ+lbM?= =?us-ascii?Q?MHoZM8Y7fqAp3SpE2eLvY0EjC5tfXTpfVL4Dew2UEgJs/X3rB/T8bJedbW06?= =?us-ascii?Q?Ax9v+oE5gVpDRHQrIJo3ehJYMKdJFgzwiWwQNa1Bq9VozseXWvkfqzj3P3rT?= =?us-ascii?Q?b0c2XMF4+qrN2srgzARUC++/2pwGGseOozKLb2jik+Xtgjx6UnA+251y/7ts?= =?us-ascii?Q?SwLTcBmK3ULIf6PEOMqLR4UZGgPnpjTvn+DJ8cgRqWFK3HBQ8yRdBX+mwZv9?= =?us-ascii?Q?rN+DOb/Ymhi7TuKN6tnjeVX0x0Uoa6TnF9tXFN7z7hWn9/70NtfKDHfw0f2+?= =?us-ascii?Q?oXBMuUHEsyaQyybU++6gMky+f1BHb3XxOEsmctWgdG7XtQwcA1AdNPD1O9w+?= =?us-ascii?Q?VcmVriSWrpkOj2VY0XfWtk/wNY4GDbhuHD8Y+XYM5zNP+xBjvJzoocPWTamZ?= =?us-ascii?Q?9htiO9nUQYMzHgcCuB4hos4cJxfS6O/nnipH/JxuS/ZB+TvAvoQWRVW4liW1?= =?us-ascii?Q?g0uflNtxscIphx3TaIEW48mj4Om1v6diGrNIUacluPzyiAffiqROJ4FYQHKn?= =?us-ascii?Q?QpnwypiMW/Px7VpXe4yl182RgG9BCh1TdrfM7Q92un4AsEzL7XTaBKpTZQej?= =?us-ascii?Q?cPEG9mH3FVgwCrzwGKoZydM9orr3MHRyotIkrIPUfXQBAivBujnpM7kRnR/U?= =?us-ascii?Q?kiPal4vI5c89KfqVU0H/0gTpL4IvQVigtktL3?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:+S0fixv56b+OTKIiqzmR8Ql24ZemucN22I70ZgViIpl7yQJGrXJ6qA+QirW91XqLT84uN3/nC1r1pY3NLOjL4cEt5qAohmlMCbuXUNgJBudWqeRH37RxOjHZDov85B+JL/ASV8GZZzY2MM9Vabeo+JhUGznMaSOTY6XPGYHABLrdagXNbLtqLlsH0HB6qyS7CHPP2qxoGbDQn2ZmbrOtQyRx8Sx966vml7uRVz790Uh0s9ZIJLnxUQgjx9SiuwQ7vCv04iRFpNM6GPwBqIoPeHYaiq/ttBXNDf9FBT7V2cOcKC7TIKqf5HJtOi2JENtFYb8rOUSAx6W/IZ3hYOLVs7245qHZjDqhL3vn7sFqvv/wNbiLUxh/pbckZk4BSPkn7/sLvu8Mc3nS8CbtycKrQ9mKKnnhB/mLLYMmW00Q6qA=; 5:pWjuSvc694JUKU8yhxoJi3evR2g0EjtYrx3WNrX+teBDBfzdn0gxXUCSpAVvOgz0kB9qkStCiLBjWkKHajpUTdwsePLVnyYNTF0ofQ/BZpjS5oR0E9mVVxKNdBhErhyj3bZytTTx0fTKfZ6dTHEBLQ==; 24:C6VISFlNpAiGFt3Qr1QdcGIlxZtTaDtOeFmmNqNGPjYVvxAygGA8Z1RptpHMk3wbVI8u/BktvZqsv6oVOZMAjVT1inQlpW6LsKXzkSVSuvY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:IN2C3NbRDS3dMtOfQXhk2gc1Fa1F5HzIJ8/ZITjEIpc70QW8MBBTMfdISAFdHRya3OpMdCV2xCDwp8NZoITDcyL9sAMTWX05aJWcVwsHKsbcGFIKR2UsA0+BNMMXYLFbOn+oc8oezPGM7rTN/cs1TwpC9veBptKwDcl3YQRX7qVjuY+CUkdxfrLenpagtUssgsgEMucWTUr5TpnYDLX/4i8PgrCntDIxtmwpqXU+AEPA4peZk1rMkUZK6VvVyvMQsbtxFjkiYoL0ZNx55Aibw2EGtlKSvrrcZMqQeg4h1xWvRNUP9bUrthEJCWCxThGHYn2X3M0Ycj0FftuyFc2FoocJXPOR5TSZG7XOKKU4YF2mRiwvSrYk3JziTbwEaTBatZAf5hAcz8/XiFY5NXRwKipa9l5HiCfFvd86l3SWuJGHnyfDetYpb1W0TOxIzrGyouDyfe+X4YNNCKktgos0lQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:25.5342 (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 It's simpler just to return the status unconditionally Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 83d31c93065e..02767aced45c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2215,11 +2215,8 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data) nfs_fattr_map_and_free_names(NFS_SERVER(dir), &data->f_attr); - if (o_res->rflags & NFS4_OPEN_RESULT_CONFIRM) { + if (o_res->rflags & NFS4_OPEN_RESULT_CONFIRM) status = _nfs4_proc_open_confirm(data); - if (status != 0) - return status; - } return status; }