From patchwork Fri Apr 7 18:15:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670105 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 C4D6D60364 for ; Fri, 7 Apr 2017 18:15:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD23428634 for ; Fri, 7 Apr 2017 18:15:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B213628636; Fri, 7 Apr 2017 18:15:57 +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 5BDF928634 for ; Fri, 7 Apr 2017 18:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932905AbdDGSP4 (ORCPT ); Fri, 7 Apr 2017 14:15:56 -0400 Received: from mx144.netapp.com ([216.240.21.25]:54936 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932127AbdDGSPu (ORCPT ); Fri, 7 Apr 2017 14:15:50 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="186669753" Received: from hioexcmbx05-prd.hq.netapp.com ([10.122.105.38]) by mx144-out.netapp.com with ESMTP; 07 Apr 2017 11:02:29 -0700 Received: from VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) by hioexcmbx05-prd.hq.netapp.com (10.122.105.38) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 7 Apr 2017 11:15:47 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Fri, 7 Apr 2017 11:15:47 -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=IwSnYYfyyzDHqgcq731BpWkcx04sZcqJdI00ZkBfDtQ=; b=DSk19w0NepVq5wgbY/MQhvkgXhve+bOXho9nIdCDBby4EMKksKlGabXpmh8fDGpC29ssEnj3Xy4/sJ+P4upZ9QWkzcIwEXWE5TpCUcTHudFV4qG0bB0hbjFF76+jkytKgCdsdATt7MZrrkP1BeYaVL2Q7sjHAT02pylWbX5qfDk= 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:15:46 +0000 From: To: , Subject: [PATCH 08/34] NFS: Clean up decode_notify_lock_args() Date: Fri, 7 Apr 2017 14:15:02 -0400 Message-ID: <20170407181528.2832-9-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: 79f9b448-4329-4d83-fe74-08d47de21d23 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:wo9ZybZoi/m6sQtwxGQFaU9IevbNNe2YkuHkKH8OqgM4+KhEvZD57GXeoIrxCiCy54mWMI4OWYc5sf4nsQneutqaY5S5bRbTLI0RfNN0E163IzgW9e1CFMuPxLScHdOR8iKRtGMOkC+39DSHNG1JOZMQOcpXCl/i6cgHs3PZxto5U13q28iLezKLCWBC6lPxnuMl+cDR/sJxo2BepS23n6nIJocj+I9KdcbVst/Z8UrcrtrbOx7XoqAP+AtjPC7uhnOuiiYEkWoHwF8sKGQ3vLBNlSl9nrPWporZBXofKLhakPnUGnlwr2hoWYiO4GJKtHAXsbQEVt5zQ2B6KYNtsQ==; 25:5YPhEM5s98LYbr5jbbUkY8lKQC1v20vTVPvqyXtD2lVB+5YG+FR8eCW1YyWB3WbRpFk0P4uWk3a7M3epuqD+QCeL3M3J8J0FLsYmjMfltSIFu2Y5ldKaDjcwBwc2KVCMcConSbxrvXk5X7PG7cvl/WHcgfFWciyxr5wbZ7fRVCYzdi7msyFtrqNvzj1kDm8ot2S4R4EiT57h+4qEv2TqWFqNbUqdvGEeR3MSQh1VnEn009Tph7d5hqIqLKKodRi0pPDcrD+R5+KYwZ0XWW3sG3KuDz/zp8B+9+zE7m8ZpSVRtUhd2q+b+YwUBe3BG/NyczBj3VyiWI1D87Da7ntC3eeO/IdApU48KIIRsQroP98KGtW+KKshULF7iEPbYEy4ah4zo6p3iOa3QkQFdlGVibGyNpZGdhimjcJ3XGpNKF93RW4MidfoPkBCZfBW32P5dKVlPD3gq4y+6KszT0Qw3w== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:GTwGTL/PuQWtw6a5YuVwNX4+yawsSLXFJiozkrFno87r8CnJeFQ0+ZD2fxXpghw8R9udf1jMF/TQl8Qa4/uB8bVseKAnwo6ho8F2QkDVXjwSvODCelHfPaqXCiuI68vKvxA17R68FU18REsZxsajnLhxVxmBTa54tbGqAG/hu+W6IrObLVWVZZ//Jw+CzSoCc+uW8YJ8uLQF3EM31eaezZkyQrW9kwG3my96uUSd6RAhfPLQz8QrQfU7+74hhvrVrdXINPGS02lW4z13Y1OwVjX09aNZrctXtErodUw8jBo=; 20:z7BhmOWYFAE3tkr+AT4St0aFOZMMzoKWot/WgTh82Q21lGFI65u+dYtWBoJgQLwwuGvDh9lMHRHPW6ljLTWsjTap5hXNA+3zXYcfDtp0tMTDe5cyifiPoiDPVM84h8nq3Hn+QkNhm7NMw6sFREAawvETI4kck+G1q+7xRkKgw4JtNz4QDgLRb32+m8EckW7F6ltCba7Rv+is/Ym1b7PlFzzw0NSEKOxLd2Niok2WA5Wa0Dg02N1M1rFBqbrRV0qAMYOIktyPLctcGzD29Z5mUcT+W88NrtQz83c7pk+Habfsowabr6rJcCjJmQqZfwi0dGcUcPR+nj0oQ82RJhKBupWKGM0GEp03E3qSLMt8sdNZdib6QWCdkKiOJT770NknsjFJwiW+zwxD+gPrtID4IOla/j/A2YXKPNyRQ625op4LDC8RYM3TzGheucCRKNacWd3Se14vB5pGfwI9fb1w5p70UQSVscFEQ32xQDLO9fkLtfF7IiH0mEP2QT3MtnL7 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:2xG0QKltVqKJaF3zaPpSp35Ct/tVd7l+ESf40UTALi4btNxeiQv2VA7Cln2t/5N9Wmi58nzfFl9hJSYwwQjhBB8VC/PbqGnai43epI6xPm8b8EbiEqU+KoX7vL1VgXGud2l5rmwkkwgSkGQqAR9y7MpiG+HB76pP35+K5jXoyGUO/W5bPuZBMdMqzV/tDKYYIq4DiAswFbRclC5w1S/OpOK2f0/Bff21nh47yhcoeXKbAL1c09YvFKyFRnTKaIjZFBmeR0OFVwwM3sqMsHuxmbvlXnR6SpEPLGoqNg+uKGx3920vzUX/VEBA8IKbAfxM0n7GGkrCyEQbNoluLNhojXot+ayjiS80/E3TIb81E38OWjVWpJs0gfn5Y72sOiLjMcLmGFlrHJcFSibXRHFA3GsKq4zKHKEr0fjpb96NGZH1TGBtEv+ivXZAh2zd1rMvgh8ARhME00X2e/zj2JNtP6E8etZoKBgbXiMIyz9sX1I6G1iwx/PwNYJIjWd7VgfbNW0dXC2GzV00oDyrbOKYgqxubZXRZgFWGHEAUBT24L6E/yd4OIWIkA8dTn0W0mloI9gv6NagPzq5xmoIkRfmYdeDLA2tYXRJpiu6sUkRsHCX7PcP3qp2TSADr/4p2bl4eS4mx3FQVl4Q+VhE3jo+qBSy0kBYUFwsBIZt7gxl04ZrfM+S1KtsbHingZ0PceiRf3FbZ8QiFAhA4poPT9cYtdg0ejy2WRxssgXIlcODBVo= 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); 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:Ewxnh4K9BgBmcYIPxwFLWTfokFT94Vmkfr6JzZCf4?= =?us-ascii?Q?fRvVGcXOzo+13dhIU9cbZE7hGoh9dWv2gxpVnJ5s9mzRDqmX47nAmLJbj+OP?= =?us-ascii?Q?ooWtgLDy3jVBr5CeOtdaooXQySaeWTbnvMUJ94kdh7z/oxzZbnXhVm84t3oZ?= =?us-ascii?Q?qzQTTgaHUAMIMBXxFaJLAYipvRtYM25z1n12PKhzIZNq3EX+Qp+bK+0YiNFz?= =?us-ascii?Q?0Ox3i/6hW4sS0fF2gatTg14mx2iugnBIYBsgqEwVHok3tw6X94DZtfHuziCs?= =?us-ascii?Q?F3768Fo3065wnrBgjmsQ+bz/3qM/GU/UX3UL2hro5N/T/3ybznBz4es3NVC9?= =?us-ascii?Q?C0SgwUDjBLY0E68wYGk2e6wDr0BDQXG3GttuXJREr/qNWeTFE4QJaBpNN/We?= =?us-ascii?Q?cFsrZC/Jt5aYI/rj/+0UdNTiZWX44oPwE/UHNETjIYCoY/eU9AJqbCLtRnQ5?= =?us-ascii?Q?QgVTZgFHFbr13R2wRaKNrN8xSXnD2oDVPrUO6I2sS5PAXqaaRN9iTgZ7uIof?= =?us-ascii?Q?wu9f7tojQLPqioaoIQOEVtZEVWsuoOzSSaQnDl9sYCXoO632ScANf7d4/p0H?= =?us-ascii?Q?NXJGMdy7NXypJHBvJXSB94q0LYSW4UWCDCK6E4jkc05m5K0QfUKe3PncboDQ?= =?us-ascii?Q?T3tf4lOCCSpELTxa29cYqEc+acphVZmnE1WSGdvl73glNgIdnQ73FQVmwQnL?= =?us-ascii?Q?o0ukZJd65PBVX+rmT0JtOQfFkVVpSksXBzfDvcoGP8aMuAp/uQoNzV7vnGJS?= =?us-ascii?Q?8zC1WD9wkIKNMJEIgjtyyj+J8+k0QpAE3NUsgLnkYzzIv1N4gc2ElZlSf6Qc?= =?us-ascii?Q?2lFFaZJ8+razs4aXlY72o39IIYljhkFGYaFBhAR502zemxuJiuBoIPb1IvgZ?= =?us-ascii?Q?msXhgOu8+g0NuoLE+qtVJ+dnZLi3L+Uw6uaW7DMu8m3L3kNGg9z8B3wDberm?= =?us-ascii?Q?AIlLvFR6LHliyOEp7wqpWjJGjGuJoWCjsNQwRKaMg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:zEzgNtjntgVJ6AEb9uPCpwgvpKM/jFM0sN0aPKmoj3gWY7K1c6pFlodFDhMZZXQOLMQdtRwn7WeR+jNa+bj/j6QPx3pH1t2TztASGapR2HtVR5tEZELouTQHvkpM6kppunRdwFDqrxpyE08rCUz1GBqv2n8e1aZacKDvZc7C3YrOdzHX5YFnzM9GWezFm4ECXmxzuTVgIynOM3jjY7IPiuzWV+4yXxUYHw8HjLG8f7DeGb6l+bMHNy2KTs61nm8KQTOlmYklMLVuuAdl9UvyIXS+X3Hp1BAzGuNauB40r+y8dswnRfOyuOEda+W66130OqH1F1FX6W0vdmi9faFj70czNbOLa9PBU+mu5Rf7NfS1Lkj2U5QU8WuEzJuEMw+SPDXJGgaj571+V2q16+978znYC1hynH1NpMHR2QGwHX3OklBgqLm0IhV6DFkhMJTOiAsyX0+jahLtik6o9rsFUw==; 5:ma8h8fJbBlB28SVp5MaCr4leql9xL2wJMjlQkKj8mdgEe5hXVp1WXRoeMVHePI49O2r0nvJ9ygiyeuFW8dNbCWjxdVHSOo5b2Q6i1ImMQelYih9EFSJRYU7GRK3eBLbQTk6u3LwcV1yHRTTP+a7/DA==; 24:pmGM6+m65qhLKeBFujQf9wlKByr+h/7790ahGh8bf/iaxbJ2k/tN/kwDUbuTny6eTi1VEC9b1FPgfJ6SYTO9D6w6n9g85xSPBwTHFF1tF80= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:IEsK4YGXmxrGtt5w/7lN4Y3JS3ShDPFYntu+vAl8E4m2fEjwM6Fhs16kCWT8sSr7KHCj2K0XHwGAqRCy7AZTSrV2BfQcNRtOqUCp5yCRl3Cut+9kkkex4k6iaeAr9/n4PKeZ0TNqrx4XYJaAKdKDdrFN+HUS2+QvVYkyK8UKbCoBt3n10ic754ItexNGWEHf+NzlYggqbxZfWDVKlQ2EbVAqRfgv9lXic8o7fj0D3PMosP577wGIl5xWTBcgmLve+upVmQf4dEHeeR+8k7Q5r6WQpyFfECSGZ/s4YR/NCkQhAzFvODj9WVGt4Rl0MBVYClNBOO35qt7WcFu47QyI8g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:46.8309 (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 Let's cut out the goto and return any errors immedately Signed-off-by: Anna Schumaker --- fs/nfs/callback_xdr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index ce1e293b8a18..4cf70dc59933 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -518,11 +518,8 @@ static __be32 decode_notify_lock_args(struct svc_rqst *rqstp, struct xdr_stream status = decode_fh(xdr, &args->cbnl_fh); if (unlikely(status != 0)) - goto out; - status = decode_lockowner(xdr, args); -out: - dprintk("%s: exit with status = %d\n", __func__, ntohl(status)); - return status; + return status; + return decode_lockowner(xdr, args); } #endif /* CONFIG_NFS_V4_1 */