From patchwork Fri Apr 7 18:15:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670107 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 232DB60364 for ; Fri, 7 Apr 2017 18:15:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BCCF28634 for ; Fri, 7 Apr 2017 18:15:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1048728636; Fri, 7 Apr 2017 18:15:59 +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 9FECD28634 for ; Fri, 7 Apr 2017 18:15:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933010AbdDGSP5 (ORCPT ); Fri, 7 Apr 2017 14:15:57 -0400 Received: from mx141.netapp.com ([216.240.21.12]:26541 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933017AbdDGSPu (ORCPT ); Fri, 7 Apr 2017 14:15:50 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="194559126" Received: from hioexcmbx04-prd.hq.netapp.com ([10.122.105.37]) by mx141-out.netapp.com with ESMTP; 07 Apr 2017 11:04:21 -0700 Received: from VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) by hioexcmbx04-prd.hq.netapp.com (10.122.105.37) 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=qew9nqozFK4t748uFZ5XdbivN5z9UgJ5+g8JgOwQheI=; b=LkObJ8HXLZPLkN2TuQJ0Eb5dSehWXh/FibwTY4meXa0Uw53BSiu9hjTWoJm5kVqsr5N5OHGzrP38H4iOvMzdUZ2HEjGZZv5NAqg8kW/0qYYGSKBlof8Y9yoO0Sn/89sNwKOA3FRf+HEr6W9wKKNns0jEnk6+wXqyxP46GC4Tm5c= 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 07/34] NFS: Clean up decode_cb_sequence_args() Date: Fri, 7 Apr 2017 14:15:01 -0400 Message-ID: <20170407181528.2832-8-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: 03c0b7d3-d5f2-4b8f-af50-08d47de21cc6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:+dWCwPjw578gnh0hK1uB97DnNvx8WWkBzSQEol8ghOVvTgdLLcnEjREEBqhhNKcaZUXu95OV8PjqFPVpraxETTP+xP+a/ieHNgyYGkkndQd2ofYEhlK3lAKMzfhEf1OG/xLeZnuimsD0YyKfRNdww3xI4T17+plD/r+YFw8Do+8wDxO7dFsyibiYd+MRgLyTvWx4txiVs2Ptk/GRtQq4tSeSepFbVn26WVATfAA//N5xl9g6hfWhm4nWwWx189hvM/Hdw8pffNW5yH6iqMOwS6R4Pge5QkbZiaAU9dqAM0Ab3WAGcd0nc9ajrgIYD8bzeqC3vVzUHq6pb0CMLtZBVQ==; 25:VWNKED5GGYm4ToXrEM5QjQzk/TfV5qXyv50CDoRXsl47ieW0TOOocR1hAwtfWA8nAAXo9jwnpsGiNQcx/QZZXgqL8iylgrLCRc9iPlHQRPXLyiYmkDOyFhT96g2k69aRcJItBrjUTxGsNXH05aSs9md2XMRZVrguzF8QTZaZeBZbJq5v2G4I2DgDoWqmqzxCJI2IG5qcWOPldmnw4CxJLgWalLO5/cvxamxY5GBw/ltJ0If1kEJIj7DiapggH+5dDrkKeA0iQkj8QysVzziLkXZvZxaDO96gWayRt/ZiP3libJq1pENhTi6mAOOXwU0aCAbfcS508Qg8DbpB2stq5r5kvPNxhop/ECyFzzkfdy/E2iCsA0lwaGMS4/JbwfCmCoGzfJuuQC4T/Dg0w8CAg1eK5XeiaErva/si0X3XslZTwNk7nJlsaNCIb6N+yEHBAC/6elys+QigkNUJXFSfsg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:al5+apB9V7Uu9pLCiBMbx5xeqofrFJ0RCkFnmEGeDPWkOhZLw6DQGwV9ze/gnB6skgaeleo/xxN9AwIdr1oz6jotWscnsWqaydsFfz4fseKOLd3tzDOD2E1848lS90V3NL4CAjxHX15jto6IFjfBjcSQM0k1/GHwmE1kEMSRs+5Ja8Gj9jobGe36SMk+uufSBUNBBEOTnX7BDKiw1HwycK46cctCTcfm0XxFgVfy/meqCoc927aIQWRmut9kRcpOLpIWnOJ7ZmPNiZe4dDjCmA==; 20:obTDcIuKOuW/CD3our/wavgaMcNEl5w5kjW8BMUPojwih2XyamlIvtqJzoXaWQcMNvi3SwZq1KXlTSTDpZnBmG3FGdRXRdi/T+iphOL0eGtbjCtl5LjA52qaeJXNUT3Ghi2ER0gsc6ShD6xUa6GImt2EDrsQtMH64heFGC48+K+cArbBB8F128q5z1WtWqDD7XdUZgg93XarlgxREKBxZUtOikF9HeIsBBM/SHSPcI44MQjtpwPSRgFYvxSQxvqBVJMdpTZHyKOoaM9rPpicnoulZL7R+Fm9Br41BjiVaZcESovmShR14okUsZnbougz7vSEdXPM8FHv2S327DHgQF2zPqXSPfWpIgSo4DbtBqWA2lM9UffJAsWg2IUm9wcqvgFrAOEcT1Z+WPt29qKzzi+NzttJ9t4Pek6xcc635h0ncDYTD05c7o0tJD9QhTCN0etfInZoDqA2UxD7K8JJ4nTXnnIG+c73O9k3CVlEy2ajTAryThzWxRPdUUdxKocF 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:U62ggSvVCJ6ZT8YtgyUXKDETsWts/3aYcb5rKJfEUJqzMOJtp0s4p60ToLWiKDPXCBJUPEIuPztXqnjWsyIiwkX4Dz5BkGEV6TKwZuDCBT/ewlgJdqL72908iK9lC0vdk8Y4MQNDLOvGYepEfpmMkPI9CV7S5n4hrJY1mxc0Cxk8saBFDjp+FocTcKUZ0ksP7QGWHARVy0kaQ8lsRGtKf6V1uBTwi9/ZuMNRkrHTSBouPjXElH1WQ6r30BqJxyM8x7XwKUb5wT7f3QjCfD5T69MLDiEV0TegPsnnunKyK5F2VZHlQlz9Q+SZHd5JIAD8910shJbS82Ile+PNmQOoWUiDHc3HnMxxO9T2p7v9EqpLyLC2gQybLCYg/5N+bdZG6lVCcKGOu8l7akSz7LTLeQBlDP2Go7vSwOgKl46xoI4UJMewvqgvybQVhLSd5H3JKS61VaPlQ9vYVR1B4hgGob4FwKdrPoOcx/XL+RXmvEEzqtcraPe9YVYDa8ld3JivWXyPKnvxHtkq7xrNnxjWlVKajKOh6UPl+PI5ez/k/GobWsaHxhMHeTKCUvPkx9k9TvnhOYY8EBYABQmPxGI08LA2pzIPH1zEOQegTIn0PGyH9DgSFX1PxKl0X7Tp3uxOjsziy2rVh0O/75wyFotJgOKuTIjeXivIGXXoA0vhbbJ8lbmuOLZfG9ELB/icI/nYjMzcXjVYG19+QsCyryqSg3ITPaKCva3tIsmY3xy6F64= X-Forefront-PRVS: 0270ED2845 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(979002)(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)(48376002)(2906002)(50986999)(47776003)(86362001)(3846002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR06MB2472; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; MLV:ovrnspm; PTR:InfoNoRecords; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR06MB2472; 23:6/i9CLlG4dt0FARrQ8MZtQ3WSYyZmHF9wc1K2uJ+7?= =?us-ascii?Q?eL1YJlM40HQwLKvU4UhV0UTTCxnIFCDQw5xASuO64VKpll19NxEIqn1Q67SP?= =?us-ascii?Q?I/6YmrpIPrfSC/bUNMDI1Tok4KOF4vh9lpL1MVh7RlrtPmlvKJ8O2UHrVBLI?= =?us-ascii?Q?qiVT0SCXbrnGY4GJXaPyZIwA14Tz28tfJ2NtsUHmEzxwxQYKA0uAcyIzXvqd?= =?us-ascii?Q?lErbq0ilQcfU8eRNf/E1Y4yPghGVF/68Rwde6rIFphhOScUCXpKH/UjXlco5?= =?us-ascii?Q?EAX3GLALv+i9uq/8QXhk9rnj/NV0RfgdeAGyE/QPqvvKHhsfz9gGM56jd7SF?= =?us-ascii?Q?6ILmKQeKVnBuB+zax2knQx/2ssDQzBSlkhqJOiA6DI3sHlUJYJGhaZeFqyQl?= =?us-ascii?Q?R3DAo5P3d86wddnHCtkNc68xmsggXkqnaE4RY8k5fvS6/cQERShD1b91pbP0?= =?us-ascii?Q?PBXIaLBfWrq8zDErI5aedMXmLdiRtveTc4+XMBtnhN0PwJnISCLOG0TkfDdF?= =?us-ascii?Q?Z1UQm2RDjiPpwGEwwtxtNnmRf9ap21kiIEXsbCODCoUBDuEHb81kBruaiSp3?= =?us-ascii?Q?3Wv/RGEruXjBMjvk2yNtbnMRLhIuwOMfAQv7V2Bvbj+p47Tep+ZTv7OIqs06?= =?us-ascii?Q?bzFoDMTVzxn6vyschnc21ULWIVsMX7w3fIfvsepId+jTYind9MSTIsNJq8B4?= =?us-ascii?Q?y0d3xgXY88MHNco1z+3A2VncekHzkPpjTg0Sxxh82Juz66kfKshoNLGxxJR3?= =?us-ascii?Q?1FSHT5msaCMNTO0N1Wh8GrJoScyxkSKwXHSAX5ikFxrA0AyUH6J8ULqyA5MX?= =?us-ascii?Q?v3CMiHEveetoGMEw1EdJC386vHYi7kaj03sJayFEX1aha/gPbB2mUy0sq+Wj?= =?us-ascii?Q?t/hZ2V0GdDb10HVRzldAnXqSXQDr9XWCrrikU2E51nFnIEvyEA7u9ENmFsvE?= =?us-ascii?Q?O3Wk5foIn9OXRj9QMJNrtl/Nw46DXlxvJwiRR/hxdBVXtmjLH7CWMCPM/yRJ?= =?us-ascii?Q?kWJPGe24bBH73fLFikoeW8PSA1tnfwkRrt+RJFUTzeGr9xg5bMEA2qilgQjE?= =?us-ascii?Q?oYlFpPWWzIUNhlTmvScKG2t2OMY?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:VMFCqNGyTGt0Q6jK4RCgK+BG0F2Nin3KuF9BTb6Z1yg477wQQLx3HVIiByAQVIFnL64Vgrq5DWz2gxR3Ww7w+W4f4mZ4lrglplE3263ENvevIX30wRF9aW337vO+ag5fauz/bhOYx/iGMYjTts/O3ovToTOExsXj3ETWwWJ1P9ZZkfEd5YOvELdU6SB9zo3+MtTFBRVl3wn2rOdocgnp5kogeyG3j18Nu7SdJ05jOCQeahA9z3IgnQodwL7UQWorYeSx5eMDxVVOkapUdedc5Klln6UHbYZ8DU4tHAGlurDLZAu3WhuH8bQSZyYK5ssf2ZA1I2hHl6GkfLpbPQIeUbiXZUFOX11VPhsA2Ynj4sf6WARX+EM3CUX7rBBI8xFchgv48js4DkCMp0WxAqVKnqV4G/CMc1TFBexAzIzGUYi1XvqtiuwpbvqK0zHHX691lFXTbIf0GNiRGwCwHr4Hdg==; 5:oFhocXJZznoQpMLt34PlOL6JWjkW7MAlZSBPjFoh9/V2x8rLQ4ZgG1uxXRHay+o/e37P+Tf9hm6kI1sZytodUAhbv6fVUeYKkN5Ocn3LEEuqDGUM1oJAhWH2v4KSWBoJUHEwmf73RwW5mL/O14SGKg==; 24:2aTrntk/6fn4iofb+coFqxk0E0mxZ2mWwYhDykis5fzD1VbgU897WgMES2z8cJfSFBSas7VXYt9vg//YsWHp405VXFEEFh0xq/1lZNospyo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:MORv8nlpxibw9smJjsjZCPSyoBktccuQg4hZYgju6FQNXVjCnnG8nG9RfJAdt6wiOwXadGqLix6YLYnjkpDp84fDUK/P9B5PtXvCewOlJyjWNKXy0NdTaLSGeNKwykSBBblTDhg7M6SR/W21dp43gK/duinKKR4uI3vU/hpMKSnlrZMfOpvV36OYTToPegCxMjaOB3Q1xNdPElRzDx5nrq47qe6NvG1oPrlR4DQHw5jU50A5KzIJLNoSXTQ9W0drGUfvxAjkGAEm5dosGHppeiPkftig5MQNqPQUAaozmZ3ouAif19jWjbaPhBKm47A0GQB63FKUUlq0//5qbuFWkA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:46.1974 (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/callback_xdr.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index d5ddceb91a9a..ce1e293b8a18 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -413,12 +413,11 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp, status = decode_sessionid(xdr, &args->csa_sessionid); if (status) - goto out; + return status; - status = htonl(NFS4ERR_RESOURCE); p = read_buf(xdr, 5 * sizeof(uint32_t)); if (unlikely(p == NULL)) - goto out; + return htonl(NFS4ERR_RESOURCE); args->csa_addr = svc_addr(rqstp); args->csa_sequenceid = ntohl(*p++); @@ -432,7 +431,7 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp, sizeof(*args->csa_rclists), GFP_KERNEL); if (unlikely(args->csa_rclists == NULL)) - goto out; + return htonl(NFS4ERR_RESOURCE); for (i = 0; i < args->csa_nrclists; i++) { status = decode_rc_list(xdr, &args->csa_rclists[i]); @@ -442,27 +441,13 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp, } } } - status = 0; - - dprintk("%s: sessionid %x:%x:%x:%x sequenceid %u slotid %u " - "highestslotid %u cachethis %d nrclists %u\n", - __func__, - ((u32 *)&args->csa_sessionid)[0], - ((u32 *)&args->csa_sessionid)[1], - ((u32 *)&args->csa_sessionid)[2], - ((u32 *)&args->csa_sessionid)[3], - args->csa_sequenceid, args->csa_slotid, - args->csa_highestslotid, args->csa_cachethis, - args->csa_nrclists); -out: - dprintk("%s: exit with status = %d\n", __func__, ntohl(status)); - return status; + return 0; out_free: for (i = 0; i < args->csa_nrclists; i++) kfree(args->csa_rclists[i].rcl_refcalls); kfree(args->csa_rclists); - goto out; + return status; } static __be32 decode_recallany_args(struct svc_rqst *rqstp,