From patchwork Fri Apr 7 18:15:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670113 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 EFB9C60365 for ; Fri, 7 Apr 2017 18:16:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E71E428634 for ; Fri, 7 Apr 2017 18:16:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC07E28636; Fri, 7 Apr 2017 18:16:02 +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 8E7D628635 for ; Fri, 7 Apr 2017 18:16:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933606AbdDGSQB (ORCPT ); Fri, 7 Apr 2017 14:16:01 -0400 Received: from mx141.netapp.com ([216.240.21.12]:2540 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932731AbdDGSPw (ORCPT ); Fri, 7 Apr 2017 14:15:52 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="194559132" Received: from hioexcmbx06-prd.hq.netapp.com ([10.122.105.39]) by mx141-out.netapp.com with ESMTP; 07 Apr 2017 11:04:22 -0700 Received: from VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) by hioexcmbx06-prd.hq.netapp.com (10.122.105.39) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 7 Apr 2017 11:15:48 -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:48 -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=TSE8KTLjDGSexmjka7C0iSVaur9ZIBAMMA5zQS6B5+w=; b=aZvwGO2pk/oOUYGFqcO8kw+WZa65SxucbuI2HTnEaADsjNJsPLFHUDEjH40Ptn36GFxB+GTidWC6PDMVEHYFcyg4a9CF9jT+6qPYVnIMK74TmtPniT31jF6WKWQ5HR2ToP5MlmiMWwpAhdXIGZTXzHWd4ly0SJknvKmz5WkBSW0= 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:47 +0000 From: To: , Subject: [PATCH 09/34] NFS: Clean up encode_cb_sequence_res() Date: Fri, 7 Apr 2017 14:15:03 -0400 Message-ID: <20170407181528.2832-10-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: a1ae84e0-bf40-40f5-020f-08d47de21d8a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:G8ouwejQ2zlFC2Srr7YCOpdU6eBhMvFD8Cwf57k0fBUFGAS+w2iES6un9cKWaXuPas36jdBDLAbXoUC6xkdJ7+aTUMjV9ZOsgmABjE07HwsXqcDry0ZPGjbScGji+FkTtGhqrzXYvBWpvlpdf8Xa20nzEKjtPIvQgAEiDstNGRXWG4VEDsj2WFz3IqZ61LBwj871TyY73l7zZOStHbYagvz+TN6jhempEN/+3jl6Q2+csaIpJRxPovGvuhYyeof8etX8osJPB59kg2yskWlYS1LqVMJlrIOMfw5XeSNBPtK+K/t2ML+A7bQJWqKC7JxchsucGrUCW+cAugX1PUHbCA==; 25:LbkhP2vhhzlBsm2gg/PXZSaBYRR26pZpu5kvz899wG0mzNPW7ULxrHCb7tjTcQiqV7EDW40A4P9g0c6EzKGhXeTXADmksY4ZzOVua1J/IKxAXEoOIbP3CXbx3chXHXBmubXhNDd3irXjBkumkxNSlMz76UaZPkEzq9mY/gvJup1U/yTwrn8CyyStXEEPosHty3hRvPLEU6goguvFqc0QX/KdDdCH3AKU5awvWYxINo1zeoNpKq+gyYb/GR8ri3ipC+ndRtB84Uczg2kUuudCzbPc7BKBsR+7VZ8NitjPOHxNWY2Dz0534064fyq7BFYMQGv24bNlKwMVPSYSh0Zu0V01GogaFnvfr6EFMUlxIeW5+bzC6wQ3h+mGl9+jnlV3pSYcExC7vXxNC1zmAgChWmCSUQEs8EH2LVgY6cUD+qPaMJqKVFPxUZz0NqxX8xybiNlpYmARL51miV3ho6x/WA== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:sFbLTT7z4zob+gp/GrMU7AJ82ympollkHhZ4gIVgN0HGsl7UoJX6S5YRvwsipYidA8imVQc+pZICc0UwoFAFo5hWEeco5Jj8FNw/LQ4I68MzkNNhPoWdAdOBe02MUK09kJRQE9iCZbX6ttJhgiBKtZmqKTwuDlE04LjbSLfzS3eo+qu+cfwRYZZq/PAnh21JqN6JXrAEQ8cVO/9OAORDkxWnT+BuE1To8yGTub41TO8dHGafRWOqo+V3hqMM7/Ed; 20:6KjJKreDoTSPuJpzkYs58adluL1HZUWkC+dlxsKwAPXc+WHyL5t4uH3hikHSa7t0HB0Whn0jkM+aFmbnoT31akEKQlAI71vj5SYO8lgbuHiHyY1NGoawBwgJxnyu7OZKFu6N/0pCv0YCUs4Xxy0yAGDBuDnvESZcEh9nXIUGkD9rG6jqtu67u1V1K0fgy6ZOGt6xGYAwJmYtLe5h1pHgVNumVRyN5lJkz2xx17VRw4CkkPJmHXtNKhGxs02XVOZ+kcv7gV9vNi9oJd7y1tPvgBuhFjPKRE6j0wseaaxhsFXziEHsiddBpc8fgDwxUCNpFSW+FAO+jrYRq6VGjVt0jaiUVT9fo4s1hj6i35iwozytcaeheCg5jAk0y095Iy4fgGXKF1HcXqE9OEuzblYDKtJ3lNNMRMV+n4z1ET2LG22nVdqGZI/MpPS9seiA8seqaeHwxf4ecZPoqmB3hT09W6xoRIvubq9Z0fme5tEAWjHc1Q+OK+Bt1W+rgcbuXV0B 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:fpAgebmI0daKur5xXb9QR+XZcBVOfMXDkozLiz/u691KI7OtCEHYDp6soud9UyDZNlm37yBNvg9nrnL8b3Ii2eW/krLlYAHi8+O2k4qtySGqo3V1y2g4EzsW2a/89bsDFAzR7w3wRjFHTtDmbhPKi4ezuQX9LexyQNYlXEwb89OhuDlR3FjMgVkA4IqoEoxsiTTLH3wG1lbG7hYCkywPt3HDlOBeRZXpPxyoL67jTUZUqn4vzHN7dIdmLxJ5JtFJjSaG55tQdqv8Jz3p1J4/RUHnfAX0sBNdIxzsVHyHj4/yqaGuIniJZD5xOvsrsfMUUX6LRMG+anO9zEvbv3ZPWXwJRvln0ObbQ64MZO0N1XxbeCW5eCsZGr7+3uZk32bH9ks2KuEApypp/3P6pyl7vUR6sijLBzEIRw9mnE2o6XJrw3+KV84rOHQniR+i3k04l+r+VxRa4ls/r7qh5Qj2Wr7ue5m/gPZt90jKRTBFvO76vLbERq4InxSbrYAzZ4/iCoM+1bwJM7gItbYTBSkkgkwQcYcrAyCuialigvCd4NZJqo4UBdl+fJXHlOKK1S00Ohqydgq3nYuOQ5dtqhuMxL/JQf+2lkJExUVTPb8dqyBFIdaN9D4mLjJDXRY9hI1HWIe8ntFCk36+lJWhZaIkP9X7P1DjtRitholhsNYa8lhUie6NnKiXdaRRxg5JR2prXGCg2ZOdR6D+RKDUhzO4IAGxYfBX32st8HltksLWp/8= 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:d3pynEmF2YfLF7PRNk5ck+K4GJMp3PGMwtotY7cIg?= =?us-ascii?Q?dC16lYGZ1PkdAGvAYAskLe2y1InUFn9t9SrY5DnqIJuoYYg77mNSvobmrMSp?= =?us-ascii?Q?bQgx64BTYMfrN7Rio6wrX4PPdk3AY/LUETQNXBJi4tRClXAb7WmejVy4tVVF?= =?us-ascii?Q?BuFGX5/J2jaKkp65+t1ZOV/VuYmeiBJHnLu3ecV44JRTz18VpQLtgJK+aiJC?= =?us-ascii?Q?OYh1zQytWSuu6BkkIrwcoTrKQvhj/gwUEaFgWBom80JA6JgQ1TXDMj4HAZ8Z?= =?us-ascii?Q?ELgLaksyNmQ/TmPkZM7vZ53h1pDsUEa0ojj/hZO7i7d7vlihaPX5ww45B/7e?= =?us-ascii?Q?hpkke9r1eUjjrb+nyu+n4Hj9508+fxYyMtog9WMe2Hr6L8y1zuEh9m3Vcugq?= =?us-ascii?Q?qxAjIiJPWhe5cZAdf2B96lCaKTbVHBOKYBcbVtljSt2zGAZQwE6kJl2mgKqe?= =?us-ascii?Q?Kh4KvEpZmZ4bhrCHLsnwSHhGxHJGNDKkZ5cWA7lLG5kEKnrylP6jdG5LiBlr?= =?us-ascii?Q?sMB/kCIoIAv2F+B63EzKJ6LyfoSNYhWjdMujgTVtNblD9+rcEkDADE6HauvG?= =?us-ascii?Q?cBXcXKrK/ng8611zrHJTxh1ga6Z27jFdqHbbIHNaPG+pw04cVrJ8E/LA3Kve?= =?us-ascii?Q?FJp10KggoiUa9zoiLcUeuA+wgmzJXbc7d0gLZL2Q0QcvjL13vLGkISotrbjE?= =?us-ascii?Q?eBrjDJd9oIkyLQ4r9Bn+LAS0vE42CowAyb4IsyceGbehT9P2EsqXDfbgDkRL?= =?us-ascii?Q?K+23ZBFPQ8d7GuSMT56fmJL1EE7LE4jGFaWe9KiRGOHYMWQGbeesbDo7TuH/?= =?us-ascii?Q?1gLABgP+Wzwlv6iilQp8e/jbAWRPXikyeE163UfbWedJMsEKGyqN/5xQBaIh?= =?us-ascii?Q?oeguCeCmkw8VNvh5OTTXbVPgBAlXadzvQ73BEqi1lwfCG/BnungoVKt550/F?= =?us-ascii?Q?ugWYZ2PveZDJc0smTS3uJOhLKRBb6cFqdgS8NZzzA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:aTTGfVGsQQ426ZoAW/OA9hNfVNprwSEFSszAddLxAwnc8yylshxu9spW1QiNSSUWedHPP8eT9I6SCcXudPfxrCflnfapW1RZG/Wi9FaBOKVfTylblETlbcDzwkdSClqzzveCjAfIdWEeAb8pCcL9v9RQan5CraIG2+DW7ZNZdGpog9Di0HhWdteAPoNl74A6EjQ2NxGocZzxmFeuegQQPyar8M4XXYBZ82vk1z48E459mZa8hVyXMLLTc9klpxhGNpdHFX9WiqPcenjOZuBImQUGXgKXx8b1DV0NuNzcl3/zUZ7hNcTUxDU13ad8ZDBS7C6PDn9WMn1l0k2tzxKp/Rv63xUT+cf/NiOu8rm6XzcougdCEWXFfdwhYTAenOpC9muw0dgUTUSziFmL4VxhUTK8bPLTCUEc6oKyWKSGZ/dzxXsZ5j1o1BaV6tRhyTwq9XLlcn7PETsZ5y0NCFxsTQ==; 5:Qs64IUrktw1tNidInthanF3LEuVcCcFNDOd7ucGkF3qX5Hw4xqXpnrBlmcK2Utzk5CIRdb6Sx2GkQtPGEziRuiSI4XwjAc/pQgtkL37Ulbk0H3Qeq+7NQy4XgCPyPd8SF3hSFAe/LoZexWqUkC5YxQ==; 24:xWm7Tj54Mr1mCUATqXQBWA+6YT++GJQQhgGecvh5N3ydSqb3qgEEkbCFIyv+mKBqLxAZBmg4SOX4eF95jr+pm7qmwQgqSFGsbwleKDYzuY8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:WjmP3Ve4fsQbl0mCPd8A3w301WEdoP5CwX5hFSJdjuQqKKANUX4DLXPHw5Jar43/vqckVSzRNHhWxg1Y960EKLAzBPAxB6O59PcRaMhc4Oi6RHhaIHDmiBL7+Y8XokJpXhDkKYfc4Cbt81bB70cQlGKS7oRNju3NbjT+YjMvr0qS/HI1TiTMFHTdqWOh4hhJsz3KIPj43tFSh+NND1DYxG9v+xOjjPO7WP166+SwG77nkgq2s1ydUFWluYkOaH1G+m4isBJV5Z2TgRmjWmTZURSxAv1NTIvhal3VoyhCMhA/5Et7LqJB0UTTLHDmHTIO1pUpWtQEXdi5iCB9g8yrMQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:47.4874 (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 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index 4cf70dc59933..e54e697340a4 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -692,11 +692,11 @@ static __be32 encode_cb_sequence_res(struct svc_rqst *rqstp, __be32 status = res->csr_status; if (unlikely(status != 0)) - goto out; + return status; status = encode_sessionid(xdr, &res->csr_sessionid); if (status) - goto out; + return status; p = xdr_reserve_space(xdr, 4 * sizeof(uint32_t)); if (unlikely(p == NULL)) @@ -706,9 +706,7 @@ static __be32 encode_cb_sequence_res(struct svc_rqst *rqstp, *p++ = htonl(res->csr_slotid); *p++ = htonl(res->csr_highestslotid); *p++ = htonl(res->csr_target_highestslotid); -out: - dprintk("%s: exit with status = %d\n", __func__, ntohl(status)); - return status; + return 0; } static __be32