From patchwork Fri Apr 7 18:14:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670101 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 641AC60364 for ; Fri, 7 Apr 2017 18:15:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D1C828634 for ; Fri, 7 Apr 2017 18:15:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5212A28636; Fri, 7 Apr 2017 18:15:55 +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 F029E28634 for ; Fri, 7 Apr 2017 18:15:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933366AbdDGSPx (ORCPT ); Fri, 7 Apr 2017 14:15:53 -0400 Received: from mx142.netapp.com ([216.240.21.19]:49973 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932105AbdDGSPt (ORCPT ); Fri, 7 Apr 2017 14:15:49 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="181463999" Received: from vmwexchts04-prd.hq.netapp.com ([10.122.105.32]) by mx142-out.netapp.com with ESMTP; 07 Apr 2017 11:03:36 -0700 Received: from VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) by VMWEXCHTS04-PRD.hq.netapp.com (10.122.105.32) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 7 Apr 2017 11:15:46 -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:45 -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=tUw1FxwKI73TpMQBVNsoefPjcqulkS1QADF8e3dzf/c=; b=WEcciVDuvMnalE7UIMNSsjxW/6i8bKVtfGzWxQIflSgKqarz1+S/8NWfLH4gd7Zc10Eq7GUDmpslOhtkZN/llDz4oMLngchrdtEOJWMJpWmUGnH0tb9YfQaz8VDCtFud0Rf+xDfrrJx+r+beyJclR6arfz83cx+NtBit2HQMUH0= 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:44 +0000 From: To: , Subject: [PATCH 04/34] NFS: Clean up decode_getattr_args() Date: Fri, 7 Apr 2017 14:14:58 -0400 Message-ID: <20170407181528.2832-5-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: b010b26f-0901-4d27-d6f0-08d47de21b8e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:BdmKCpT5s/I7idwXllXgxD8DQEyUR0URKKLJTPSdX7gpDzAv/HTRJbZQb681MsuyN7s0y+iolnUr+0uwifgEP14eHebhhnJi7G3bcUzB348yvinDLDXOa07exIaaMrzww3rq1G0f+cckeIa4Y5+JpJTfXZXHsR6Wz2OljjfpqDT3fwCoUr+x1v3Rb1mblhCi0W2BW1ucCl7BghEoDMf0qtorLcX1wlZsxK9/0IP3Uo4bRvh9yDJND+UcuqVrXM7XP4YulO26pxw88+/dTdrMM6FwQcXcVwgWKiRNP5Mxtpy3KCjUqw92Kfhs3MElR21yiZ8bjiXzc71NmvjenIPVYA==; 25:qOZzQM0arxHtf8vb5GEqWoX/mjPkrs5YvuZOi3okJsRWp5PTf0L7A2aKBTIvv4lHyp/5aYXYfT26FuS7jlpwJRA+/OlpH9NrU1dnm89CCtMGb8NlfryDWBNMXfakbDVygZN6hbgyBQe/tzg4X6yfAmqArOLrMsIIAZvq7mybtLej+q1btnPnyVS52+1ft4XGASEUqm0Ljz/IZSIKIbt8bDYxV6//70hqmOLSUWD/vw6mGLHbPG8tx9exVPUdxyWFvaNFOPOVOq4SSRrNEVa3wRHWiNUCqEi5HVpYZ2LQ9AuvPcYavd7zxYn7p92+LN9XjvOtKLPiFx8CZi3LGrYVpCg980NhOJur2MjOlguRnMB7kJ9eFqVd5QtxsXXqSuxxAnw16u/e3m2KNV25auYzTAU8uE/A+SeQXNVPSV7gejryZ7kPX2cgmRVQtTRTFg/37KyU8qIjiLTn9YzZ37P3Hg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:f2TJYsy6pFZsPuSrfn9tanAZ6r8X/uPEGBGLBR9UROOBVcVdrOWUtMJXEetEbLhQaulgKuq9UaC340EcIw1e1a7/T644mSnYZPiJIq56E98DC8yb3OrKsS3ODdIDD39WIbhLkLZN8uxEEHp+3ilxHXtp3ogyxdHIWyQKWKHI1uJ7034BADnlTazo8zqigdN+NLjoXj/5wJlsNg3mMZwUbBSe9FUsXtAYs7Y9h2X+iNVCt7OtrMS40/9OmR+SkWvx/6rHyiTBnFWzsVnLfsS7xQ==; 20:lBeWzIEQKOaPT+9ji81WZw9kxxQHta3bi3PVZI4sl0XHgdNsNlzMzbsAEGUvbDU3xQVcfVcsZXy3KSu5xHoWKVu7kA55srYQiky1MKMw+DjvoMhxZgrlkung4u8WIC9l8LaFCw2TBdMxpEbUmrcWlPie8FfGwiHjB0aOazoGw0CsdJIF0xl4rVTv0H3uCBOwZ7tC3YqEup361O+5HDa3qzc5WMfqNqtmw8HZuoRDNPFia4rn0Iq7dLjZOW5VuTIUAXAkKtY6nBV18IXJd/rwNWXT6odSQGanrDBc0h/+8UslS0oKdUH7SHBA1hJ/Eb6fizwXhjP5zGDRYrNZTEpsXUyz0+dc10lxoHlIArVws8SDv/I949MCwoLIQF8cS1SUpDeJi/M4aU126PuzrKGV8zRmK2aaOpAlqOTBYPy90hekHPb8Dh6Wvd3hJXEdc3c7V2GJaqLJvvJdN1P2l9WGJ1z57L7xXu04GC63VA6OrvKVoyw4jElg/OPT9Jaan0mf 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:G2/Zq4adQRj4GiqVsIG/hA9YGz4d1dJV0Olw3k9aujxxY9CdJbFBY1JUcteoc3RmRJs6ib42J0FBhveSVHosQAnL+MnMfgUBBoD3jHpm1zaXND6JRTzsIFnMCGPqU+KL2IslSqISlbkjg1Fk5KIBLmMnkASbGSdj1i7wYlAEF9td+S2kayxq3jvQ4zsN975JPQuFYFuhZkJsdSO8nzi5KLa6AmBHMxX8AZuBNmq4OKaRfoblMa1ldwgWhYwrt8U1/bw7FBVQ3Yp0aBu9gwoY6R6u2mV1k1GbpxhekSjzg9GWcAKS+t7CP+9kbB2m8gqNDCEJq+GO8r93KAqeNR0gpPqHVz2UjUN3MCu/eN8laZAM8RWY6V8z9l9G78ngiK3iNQnbX7a217K7Tgqe7r0oWKj/qqW9qbwE5tSDnDojo32nJvAVZ67HOXRqlOAgmNRD03ECr3O0sDP2Z0zow9UmnbFrYqmxfgD6HTd03C89Y9z+KLVUAWY50wYZyXudZTw9hJNyOwN3a65piOm3ZFJIW18AucBwhh75wgaoCN2KR1+w8nCY4L8O8iTlYYOBx8E402E/hYd668I+lBHc1XGOK4jofc0KO4JnolBbtc1TugP/yemQWpR2aGmBYDGp01TXshuVzRiNnDgWzdTqRscPAI+Zvy/goCHPGgSi2IdZZeqrHke8MiMeeRBzGoznAnT2Nlz2dRGDWxQ7F/os6QYhHYrEo8YXsTpAKNOlcqhAaOM= X-Forefront-PRVS: 0270ED2845 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39850400002)(39400400002)(39410400002)(39450400003)(39840400002)(50226002)(8676002)(81166006)(76176999)(50466002)(50986999)(3846002)(86362001)(47776003)(66066001)(42186005)(1076002)(6116002)(2906002)(48376002)(6506006)(2876002)(2950100002)(189998001)(305945005)(86152003)(6512007)(6666003)(7736002)(5003940100001)(6486002)(53936002)(38730400002)(25786009)(36756003)(5660300001); 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:7tpI6IWko1tQIs+5D9lz1InVCpq038GLGX09J+/cL?= =?us-ascii?Q?9KwKxiAcqD22lVZmtSsIQgOf22ZcGyrqQy2gXj2TbhTGaVRNpBEcylh2nOub?= =?us-ascii?Q?9RTIblbCjYD2EgqsyyzIuVXMvK/xUHf7QIKGisHaotsWYeletyyhLweD9WmO?= =?us-ascii?Q?hkTcc2s2HMnSyOtk8Yrkk23LRaeVvG58Trza41m+d3n8NeSNmSY0M/W1RgG7?= =?us-ascii?Q?aRfN/Zsgn2lBFVNjs64GG5W6t1epyYb+DIfMS8I0JxI7lQgS9Qbw0DFqUjDm?= =?us-ascii?Q?/31UjMSLpn486GUibAlGPpUXq8usR7ROZlm0KcYkRql2drUrs9oyrjOjRMyK?= =?us-ascii?Q?LUqbjuAv8JvS28F4bMvJnOtuGAcZevvgQkQENZAhGacSaNRzu+yAbZVkOYlV?= =?us-ascii?Q?nT5qFSTTNAAVQKRD1T43e8dW4H3DjQVqUSMfsCzA+4ilQz59SQlPpku5M12H?= =?us-ascii?Q?SyWwu6Svfn48NpIybYGiYArC3MtwyEARLSjiqYWlU0Bsdpzg1gEudY4LSe5u?= =?us-ascii?Q?PFCwihRwvrYqNhuuQgy7eWpdLDcQN2hHjW9a2B3kH+JZ7WPyIaAYpfg3+beY?= =?us-ascii?Q?In2S7RPkfzpdRBeCxaxGxYFIKo1/90zfzXuhtATFOsgIvaRCYHGaZMgJdH0c?= =?us-ascii?Q?yQdZtCxmOmhCiCxY8OSbKypZUCCkoW5zKafQza1ME9glMtU+Afvp9b4q0l3k?= =?us-ascii?Q?/jH/kiCeyffCqWR11t9GgQOtLVm2jNwk1GWgSzymo6MQ3BLJFZSoUXpR0U5O?= =?us-ascii?Q?tL0QuZwDICvbYbnDYa1x+od+zTZqJdaYK6m8kpRwWjw4yAFzsIeR2IFuofOY?= =?us-ascii?Q?QdCL33TmcCzeBSBAvzSFtiR4T0NArkVc8HX72Pm6rZfiwzlPA/v585rIMRJO?= =?us-ascii?Q?QXVYEzoWsj7RNnXKsARChEzZWefklr1104YCRU6pl0QFCZg6R/YKHklTB4s9?= =?us-ascii?Q?cvaoVBAgGnf4Z0GwGCxfcE1+tGYOrVk4PrM9BPzKyy2y80CHaWjxjWd+rlz4?= =?us-ascii?Q?xk=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:GbyRmUeJioQn1UmGl8OFhrG97svbv1O86aY7yZXODHBAx1Yr0GouYMllTs9eRXW5b3lUBr6szv3mAAyxVJNHkG1MyoY+rBaD+qTVoL8/Uqq3yTtpKIGucEP5v9dHcPrzx0snxpatc23iI5bJrTejVF9Sm+8PhiILcLiSAS3GUNGckgmo2XrnJ8wWxesDqWpoeC5Fx6U60UJ1m0QEP50ivJTsEWRi92vnBmjwQXpZjla259BsoVCkVn1Z6tX0eBoA7cafFNwoUbvvV2PtORaoDnsP+hRayHnJpkUXdguWCkoZaYNHLQsRP2Wx0xHrVHoHSirvvlyODbS3FQ1dtUqxjtN8mVeDU5IeQn0z9pkhOVbn/wEj0QCrOTREXSW9evhs9AYLYHbgb2sFyD5M1puA3h5umKyOWGE7NSYtSOSC1AABqc1MMadyJ7EhEEg8lJsLu0xE0O+OaWbI+2sZOaI18g==; 5:ifQ5PFaXp3JLtSOPjawDnOE0fpgYsNtxcRaO+8+zY30aaSVlpIdNMDy37DBUz2gpOOCYeWWd7beAXaKp8FSfS4sBYAmucGUCzg18QNqjPiQzFtNWm2T8wN5EJVmMKw35JJo7PNdiLurPPXhLqGlH7Q==; 24:71OqNBWdbo8t/psdxVEpp8Nu/Bht0PLJk8C8FpbeqETXyv8E0K2acKqnEaHV5VrEn/pyLYRvuaGDq5fhzWk3qiBf3vFZKvxO6jKO5vF6hFg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:JWhN1KCyGdB3FFnwltAaf/gFGnor5EKiFOp7+t4E6H+Qv83hSRVwIriQXB24YymjYwxMuSxup5Rj9A/fr4Y0RtiwvQaG+yb+yfWTTTzZr8QVrM2JBxI/7yOjqRPn8/dnSN8M+za0cgyz7IMeEaaVNVc9Ezobm3lWG1QGJA0dgAOc0mr8LFSJ4j2WKwaj1SgIGnNwB7W7cVE3C3Bs6jCA+XZ/7z+n4aMsuXDAoOaiz8HDchuTaJmop/Fd3RYx3hY7k3COmZZRYwDIMMCspK3qEAWVvSzvnTIq/rQmiTbYDkTj1+QuEHdZoqqFhxGgVbcFyKhTMjsecWZtr6WRokdPFw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:44.1536 (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 Removing the dprintk() lets us return the status value directly, rather than jumping to a label if an error occurs. 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 d051fc3583a9..c782261d86d5 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -192,11 +192,8 @@ static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr status = decode_fh(xdr, &args->fh); if (unlikely(status != 0)) - goto out; - status = decode_bitmap(xdr, args->bitmap); -out: - dprintk("%s: exit with status = %d\n", __func__, ntohl(status)); - return status; + return status; + return decode_bitmap(xdr, args->bitmap); } static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, struct cb_recallargs *args)