From patchwork Tue Jan 17 20:31:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9521865 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 572F96020A for ; Tue, 17 Jan 2017 20:34:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 448B2285BD for ; Tue, 17 Jan 2017 20:34:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3810D285C3; Tue, 17 Jan 2017 20:34:12 +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 CF937285BD for ; Tue, 17 Jan 2017 20:34:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751194AbdAQUeJ (ORCPT ); Tue, 17 Jan 2017 15:34:09 -0500 Received: from mx142.netapp.com ([216.240.21.19]:46732 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751167AbdAQUcw (ORCPT ); Tue, 17 Jan 2017 15:32:52 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="165683703" Received: from hioexcmbx04-prd.hq.netapp.com ([10.122.105.37]) by mx142-out.netapp.com with ESMTP; 17 Jan 2017 12:27:04 -0800 Received: from VMWEXCCAS04-PRD.hq.netapp.com (10.122.105.20) by hioexcmbx04-prd.hq.netapp.com (10.122.105.37) 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=Q1nGbBesfCcJazX2cDz3lmFJUjVrZTXUWMERsEPKvEo=; b=mef/AMaFD4WlGkCy2x4eJgIcCVOkGOmRrwuBVTTWANjtATkxpeuoAxDKjIrjndeO85Yohr9Q2ZlzeqRUHg7TljLIyZVE/LBi2j5CRfI6KJLn5QIYgt/PY66fBIPlqgk1V25L+KjrAheSY/jeuutAajdvWY27sdA7v6gcUgiwEAk= 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:24 +0000 From: To: Subject: [PATCH v2 04/10] NFS: Return errors directly in _nfs4_opendata_reclaim_to_nfs4_state() Date: Tue, 17 Jan 2017 15:31:59 -0500 Message-ID: <20170117203205.29033-5-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: a85b1ea2-7fbd-41b7-c820-08d43f17f270 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:gNy9VydlrcSyLtSdNUF1Yf2JchUVy1xjL7zU5G50JfEmUjYo6pmgNvmoss6aS7bD1i5qnVO86OgoCICNp941+C7nkf1xpknWVHsb1D1Js4035eEQxSqyiWr5i9NGcyEYandg5Opo7FVFLte458o9AcaRwyusbZ0uktKnOMxRNWoJetbHVB6Zbd+g2v1ikROQgppKxBxC7r5fTwI4HUWFA+llHFj16a5b6EAHM4OImX/rfK8dzwEtnxj69j0SJmRgSEQeUJ7RR5gEFPENNTCzfg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 25:sDCFSQyB70aixc46xYafFikklQiVWzMqkXQ46jmg7Qce9EiynN23nQlXu8oJrWyyY6+yW1eDzfoNVLY6qm8kbNhIsSdPH094KDeJ97wFE7t0pOZYDeXVlsrBgzhfronfLLDHYwBeiXqG4gmBf8cpHSsyi8M4ZLT1Tq26A0Rnk6fw9G1h9AmsWDakjvC49OSunCGMV9RWBacFNhtsgNcabCup2WUy3jyrC1pvMmqNeTVUZigD98EayXgdun2PkTMZtuzJBarXv4RlYYdt3FP/aM+bxs0/i6a/L+r0uC6G+EthBfzA+5ahEDhxavsrYn+bgZWIPhkAcpf75mQVB4DxLPpqPgVMJc2eTclaK3KuVjLilV2FRohM66ngPa4RjelhzWLIxFdXV1DHYBUtRk6RNk6cfNRPHPmgtDXEis41gKbU9rMYYBEab00Q9nfS1gR84pjZBSThyxFvCT1ULzUmeISGABLvsm3qsHNOHtdbnEZuefMeiQZpTYbRypD2NwmcK+OdB4WCLwevmZT6LAzjl9ANfrw4T8i98RfUivds/7EgSSSAMxMBexa3IVGtmgufFRxTWl5s922cd6fWyQ2/iiYTWPDHy93JhMYVlfhs36KFmyKM9yQJ/u+Rt9aRsRpnqnE/KAl02E+BKm3iOKU7fvAXHLVwwt8XKydUGmv3okCPhJqcbO3OXiVajWg9+KD0f2l1Qgbr3Akp5xEC7EHbK9T+rZvMP2dIuWSsL56co4qht0VEO7OV94ANwG+TYGemhYDc81UILSSYD80W3WKf/04BkEnc8gSqvsbiqAqCmKw= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:j3FfRQO1JSSIjjV/FyEf0+5737JqASjJlsQZ5LkrV9qVAP2RSF33OBBBZklrUNeOIvt4wUzpIx68OATAh/Ttx44ZMDj1rtZCoO3Cv7wwOtvmIS+bOKQcmfWxmjJC94bmZ+PEA6wlWPW0ofLTfB+p12OtJ+ghjd6clCZuepE7RkRTf4rp0duBg2R2JIezWuwCFgZgeQezcOMIDu4ZgQrl6OMTlzhV9xJ3BwmTkKHZm5ZIlyaZatjTLYdBLJDf5gH/wr5Gv1HQGMlWHnmn+J23uw==; 20:pZjYtJVLbMglKo+HY+TFrh7rE9pyr04wvejgNbDSmXtlYCDMJltLT1uGylfrwKWRV3BhCDTCmNpI46pbtB0Bup/2aoIqGHvxBvRIwIC/qdubcvZpr2Pwc53Jv5ywo1WUbYjT7daTAOHSw9k+m/6snh+GIVpxwAbdHVpGDJdzE9uKGpE/fnCLzeISX1nGAitGshY+RjrekDKdOS6/LtLlDzshQu5/IOdTnToLDfwSnoSHtXt68AsjtJyV871BWYQ09FVQxea4l5ROnT/Qy4PtjnWVOXKFKVVtw4D/S3Yj4IuqklXrhmTgy4rOp15RyaOHRhYFeL6e+16kKFsUSb5Ov5tZmn8np45iqwM9Aqscjwqwslo14VQ7qVYxbBSXk0vWRuSEJ0NEfrJLuV3FWL19icF3wjRtQ5z915f5VzOodCxJo0yhZ5vYSxALNZv3rXU+ugFf9EGYNY4wOUo+3OCPsSmpP+QKg/xHlmma6nzKp1Sx8o4u/CP7eEkd6pVZ7eW/ 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:Jxlw8Z8pvon6yinjLDEG7TqdB5w3zKQG04rbFH275bL5EJglG55kXcMtCU0pIbFoBmo0Wos1d+5nmhIPEdx8KuFW8l7VpohS3cr0+3LXnysu2X78fFSxPXrHKM85IKErRjEkBdw9L9dsaF4KwlJifSXOoGGrrgdbXC2wViOw/RCct89W/KVjWG9LDGOB9lkC0W3K1kYrV2Apojv2R/OWODeFY4KKkh1yTJvMPVy98VPmcj3EorfyTuizjOL55z8gdLMl5EfxuURhy05fAyslo7MWgABV4CD/sLkGbVx2nkWlsSxGYU+MWrq+s8fmdyeeMim9nafQC3jfWbFwQ7YHOMn7lWY2V01RT4LeslBu9z1cO98GM4v8RRMMZpXNagBGSs2OTIF/cGks1WiHpcykbZnf3fx3Dylw5xxj1lRI3OtQhh+GQ0td2q1uTNS6OA5uMScaJeb4KiHDlmoiXozyB8OoKNqqvr71t9sb0yCZIoBez5kwjv5GMQD8CtpxvB297YnomplITRPvgUN/RGzfks70uKG5V2C6QY5qWqnVjL7SPzX1lmSQgwXJMKHVndZbH1dp5YRF2p7HpoHIMOLE0A== 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:eP48oH8xPkXOGY3LH7hx8f5FZxARda9YiWyTvPm?= =?us-ascii?Q?CaxKBtvFgbduEobhXegk8U0g9NkgrQgftI0v4FoaVRRKlN/13Y93jASq3IKn?= =?us-ascii?Q?8KDHDKvQrT9e9P0aNeWZT/DJ4eqhQrnN1qD+9JCyayIvrcF5T1jmY/qq49H/?= =?us-ascii?Q?+EwXjdGRAIK7IDQaSQBr+pmBNNWzQCL84IumsyiFFkA1HRnlFoE7zAUxEvl5?= =?us-ascii?Q?ktznCqp3S6xnyWayL1AUij6ghrzUGeDT7NOCWUUTbzpb9KMt3I0FJ6NOjULq?= =?us-ascii?Q?cMzlRxzBRhDbTMlBDiHPxL04i0izTbmPywNyJ4kLYIRM4kXaIaRuLV6DQGOz?= =?us-ascii?Q?F9aUWicVqt8Kfj5JJlz7lVjcZCuma31NDc2Otlvyv/9TRTgkImoQGkT2iOrN?= =?us-ascii?Q?sCtKxLR47LJIkV6TqeomB87DSYcUaE3231RZ1R26iGIUjX2cnZ0omjMUQOL5?= =?us-ascii?Q?OMIy9N/ruvpe/sUtdOMGq3aZZxhYEoqVXX5wY/IQaNDYXx3QC975td8WEYwr?= =?us-ascii?Q?sCkVjhIQFHpkoBCmajvvPRc8EDcwf61lSK/WJO+1ylty6EEXxYGZGhrF5brt?= =?us-ascii?Q?kGHpulCBnS9fQNYfBU0jKjsbMhoGuBSPPK6LAovFyHqQTZMg/eHFKbhc/n6d?= =?us-ascii?Q?ltjUqhUz07nVFFH39ZvDQwVZOOCvo5mKGVWpabaMZP+FkErGPxMOPDN/Z/Cy?= =?us-ascii?Q?4QiaQoyJxtgPzBAWdAh2WEM67w1grBKRABFIU3Ke7V+BVeFSakFv8CZfJXoC?= =?us-ascii?Q?UP6sNf48BRrDdIx7gx/wZ6CwqVC5HCzkLB+jnytXXlop9nyQeu31LopYmob+?= =?us-ascii?Q?jUp+HuYe9Rziz85TsUF1HwMMklgZYHZo30BQ7VhJBwt87ohOHWZC17kOhpaN?= =?us-ascii?Q?CAtl+OaQE4Wv4M2XxXv8P6PEzCTn9ykmEn7heooU37SPr6s0TJJQjMObvjoO?= =?us-ascii?Q?JE75Llt4vhegUNe/cWl7rrAIzu0k9B2BJ0/GZkBKEohVidKg4aERBI6VepeO?= =?us-ascii?Q?Kcs0Ht9xc8QtDd8g3dJqnMDnR19OUW8Siq4ao6bfzYtz072TbUIepjfBVdbP?= =?us-ascii?Q?EaRUAixZnS3bE0g673WZFOuV+1X0bNi8hfe4wDznkwGKR7DyakHzGnVhkaJI?= =?us-ascii?Q?qEe0pXbRsX7vu+WlnnBKnD8zQDt/as9+BYb5rl+dNyBNDDmmSoEwQSk9CTLn?= =?us-ascii?Q?jYp4TGfcQenwxf1KVv1AwYcKrB5inT/qIsBRM?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:dKgR4lQns5QyNIBCZSWaIbSxvQZM9KSJRj1aYFJelLXUdEHUJg12A4WJsSGfRySvkJ7GXeg3Tyvnu7IcBxoKxcvH9wVJ9xovSjVtPWbkUEEdY6rJIzAVsABsfVtPcMG1AIpxnj4r9Bovjx5Ezj34VMsMFUrc+97bjEURgaPNBVJuEE34Yff78YcIJXcKa3EU8YprvEqoIe/WNk2OVxMGSB7nqKyQFD8AmdXhb7hBRtJpZowZU5K2rhVr9SaDmVBnZLshd9Vcv0nt+82YfDUA3g2tU4a7+6hkL5Rb1+NpnUaw7YH9FeEWRSmELT/ysnsEqs2lYmINKh5dDvcixPILf0vvPZPAnXogTqJZFvdscqIkrk6Vg+qGyqlh2r7HKhEWKDfX+5HLYnGrPctvBu2+bGAV9Y3CgC6djQydmGEFUR4=; 5:uD63NyUE1jQq5F0aBcdnzsEx5X0Vri2BxPvt0vBr4a/Rxc7cJvpN93DlnzEK5/ayuQTNbCN1T0giIWuyAsHcEG1XfTCEh6EN5nrMd+/QDzUKVvK9JRcYoXZaEpWJ9w5O85aWA6yPQojlDxM/vIAoXg==; 24:Ll87OIfI1hKlz7DXYeobF4LaOmGHHNiRTDgITj3I1ds14sGNOeyL7M+zvmhU4Gr7li5Ln6OLqSU+HbsgBOEdWldsId1XJfJc7O9TFPfTx/8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:1BmneiO3ni3abbqsv+DqjUP8n3j5ZFrDKmp2IJQY1jXJAIAZuKn3A1ZCytrStxMVxCCvGrmMOdVlk8Kgd6aPf913gmBJsOqlYLgR08eQVEgSw817DN9D2AsUwYc3H348CDnUxkXEuRalxM6pE91Ih6DCjyXsEp/+Uzc4URmN5Tb8gBchXD2xSV84VCb2/3iNvE+k3Y9vIrHUyhKC98+BLropwOCutjyS9dCc/i3oilLvjGlHhSi7v85UR62cf6y96BtunhvzxEP/Mo9hg2OAEkgNc0tFB9RWAOXzRnQfGqXObNnII6SCk2X2Eu/eZQmWWhZ3FQxpexAIKr9TFi9GOQMm81EfUPApz3CEyyiMcJh9qynBYwMg4aG+j/KmaXaxTfg9qhj5tCFeZC1sYYbApxl0S8zHTSluB/wqvQ1nmg0k0a3t33piDbb7K/q1v/rS8phEcNDGPsVMMNKXMZcbaQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:24.6864 (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 There is no need for a goto just to return an error code without any cleanup. Returning the error directly helps to clean up the code. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 950e9cd15e5d..83d31c93065e 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1638,17 +1638,15 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) int ret; if (!data->rpc_done) { - if (data->rpc_status) { - ret = data->rpc_status; - goto err; - } + if (data->rpc_status) + return ERR_PTR(data->rpc_status); /* cached opens have already been processed */ goto update; } ret = nfs_refresh_inode(inode, &data->f_attr); if (ret) - goto err; + return ERR_PTR(ret); if (data->o_res.delegation_type != 0) nfs4_opendata_check_deleg(data, state); @@ -1658,9 +1656,6 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) atomic_inc(&state->count); return state; -err: - return ERR_PTR(ret); - } static struct nfs4_state *