Message ID | 20170407181528.2832-3-Anna.Schumaker@Netapp.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-nfs-owner@kernel.org> 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 67C8F60364 for <patchwork-linux-nfs@patchwork.kernel.org>; Fri, 7 Apr 2017 18:15:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60E3B28634 for <patchwork-linux-nfs@patchwork.kernel.org>; Fri, 7 Apr 2017 18:15:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 557DC28636; Fri, 7 Apr 2017 18:15:51 +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 E380028634 for <patchwork-linux-nfs@patchwork.kernel.org>; Fri, 7 Apr 2017 18:15:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933013AbdDGSPt (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Fri, 7 Apr 2017 14:15:49 -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 S932127AbdDGSPr (ORCPT <rfc822;linux-nfs@vger.kernel.org>); Fri, 7 Apr 2017 14:15:47 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="181463997" Received: from vmwexchts03-prd.hq.netapp.com ([10.122.105.31]) by mx142-out.netapp.com with ESMTP; 07 Apr 2017 11:03:35 -0700 Received: from VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) by VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 7 Apr 2017 11:15:45 -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=50cm3PTLizBNrchqI0gkoqtEv1OOhyif5/6TpeGati8=; b=PGBjqPs7+VW0MYHcvfoLHttLuYoIXjIpstqLBLqe2TU/mABBSNLoaroIWkzo3QJP4MfpInLTZXFZCHTtrtdNu8gwdjOS/Eld3CSadWcsIL1WmB7uW2YPJMArT1Cb8d6n+tiqA12Ud4ScJ5JXg61x+oVJOH70jmUyHJX8nvzqU64= 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:42 +0000 From: <Anna.Schumaker@Netapp.com> To: <Trond.Myklebust@primarydata.com>, <linux-nfs@vger.kernel.org> Subject: [PATCH 02/34] NFS: Clean up nfs4_callback_layoutrecall() Date: Fri, 7 Apr 2017 14:14:56 -0400 Message-ID: <20170407181528.2832-3-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 Content-Type: text/plain 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: 0f28bdcb-6d38-4412-f560-08d47de21aae X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:qvbngqe13a5WuvIK1ptMjjNdYMpFqg0oqebhSLrs7sa0r/Dw4M5XNrXB7pNo2dXQ4BHr6aeWz98SdcaHWXLhnSY1tHFLMziZlCPY9PW4R5lsLe1SMzPT9i9pWGQUaeyLAcSDC/OIK91VS8+3bEY9ikpMvCfwY2ftWtHyRsihh7G9eRnnXG3lzlDdzfofY60tdsZ0MQ88RaKw3a3NoweUl/gjB3O2jsbASr9b3QdyE2/6xhSA8AZQUmPh3ujHhWj1DjeHQHm7j1F7gECyx+CfXi8krGofrZgAqhhVJ+wYh0a3fEQYzbEGQ0AAioFXd/KT15EDDmiIRxJLqMfTxx9duA==; 25:d7ZBH7vyNY2Cu4zDAWAoPQjgPTGLLWlRlGVKpFa0tof4t8vdS39rwR9HN4IwTZIN12OXhr/kPcK/LAMKA2fzf/h+e+OVG3Up+863OQKke5kSudAL8ao7/jc85waSsMNGRJRKOOv4yCF+XIfBbnA59CAmha0rflUcRMybsWfMef1RABsIkuhP45mCaPhsXN7t89nBIqmuu0BrOxYWlMwwRVHI4YGHcYXJK0Uu0qa2EvjimS1NEpAzKJe1/jn32/JRWjPBs5BM4NPNYdmxJivmgR+IFFos3wX+rJBoqOtDYG939elQpHz9AJ7OAfAneLHh2OyK51PGxAOEAiUjQa/FzTFC+Hx8UXswUDDizQAO37aG4ZNMh9i5lKtGWE5qDdNjgbs9wfmM1PhWSXmdgY2ET0x0BbaUXfkB4C3NI57YoTI7CjHnPiJFjqRlbxitDTn95Oc1DGMjbgKbSDqyzoSM9w== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:WpVJ1LtH6QzHeTMb6wKXgtFgOcHjdnmXennpD7ECXkl0ikpiqv+4fwgoTe0bbfpWOTiUYSM9xIzaWtuW4s9gOmzW9sLFWbTh8gB+nhXBGAsyAXX5m6RHYMpnO2uEKvM6X6+mrvBlRDpAiK2Lc7bsf/NdF1hZVIoZ9FPcE+RltZNxdF4o5OCdrZ99TWMJ6M4Rlxg9Umjs06WJOmDib5NslQ3t4/Ca7FAnNOsl9MEkLyWJd7pGp58DN9NYgNtT8j4+ACOWkjiMm2P+1+fa2LwrVg==; 20:VQONnKY7GrtTGr7zNNjy6Q1o6ssGbhxdrWHkOeKSewHr38272obd/rskrP4/2q2Ot+NqttEfrH8CHGXIfPIfAomeZeSlcOnl6LuGyD7JRqqXnL+cmViNmYYWy8fzw1eLqAID0ZX4Z1lubwZLoDpBlPRPrFKbp65dAbPgtBl1CsrxpHV77aVFmAxP6VBqnpakOs2SUYol5KNPUWjd4Rq+f0Ql1gSCIEl3q8SMYM6hGLlMIuKXvyBGao2NDcJEGt3GIG5D8lXE0oM3oohEUVqLlG6xTTiCxECCEbJbQddGN0i1ZOtHaovRP/eKv6tSy6kdwwHl06+tGUon8XYDLDfLQy3qarl+LhYYqaOt6iDyrtHe1Z5WgY3/bOtacAxVGAHfGrarLc3HCq6kfZGadAseKFBXkM73D5znKy6N3f6/4TEH55BTFKEsT/8ArJyGk3PaM+0OYw/duMExdhJfBzVd26nbliDw/ZW0WKmtE9wzMPLz4r9nwn7ZXEDAGppX2+/3 X-Microsoft-Antispam-PRVS: <CY4PR06MB247271895D3DFE02178336E2F80C0@CY4PR06MB2472.namprd06.prod.outlook.com> 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:F6c/9DJlXvnPGlb8TXsNxHcu4clXyGoq6KR3ksavB3BRq8h8kzPpd0v0RuFcdClNJEV6Hu/yLzRHhs+pGJrrF4i1LXytQuxnXmR+ay26GoDkO57eQW7QuLfCZ7Ga8SCJ0+z4cBPX74Ii8yRbslethjPq11c9QRJ1TTNWY8wTxjJRP0BCvUQOwinYJHvQYhnmAHZUUXImKjf+PHEPiN9GFazYu6f8oMsasI2YVVYA9i6cR+mpySWK6V9gTS3rRCJqUsNzj5NAZQwqr0NgZDVP7BKxRaS+ujlvsJ02h1HPoutqwS3bhh84mbYhvdUIhyUqN4WjWIyJvhdWDTzeb98rdZg8qDZ+/bQyxKF7GZ7vK6XkU+3hMWvdl+tO1xPqSH/XA0Enu9RtJl6KHathQdcV/asdwWyBaWsWeCWhquDza1u7HIcq0Es0wVupqVrDyJolalLq2itjHPksbY+E2aaykJacDxWqu36/j/+0jotpGfcg4+RqL6NQ4w2r8Ejy3Bs9MvoGO3T7BIn1Qa1YwRhZ5ZemvyeC4XOlDPMCAh5X08zPKalBHB674rQyDt9KENz3UclJb2fICKEXgicooY5vkSuZu8IsWAwdSZvuVGxcWEUW8BhYQA/2ZC5GUpdzOL3cpclla9dOgViAixBZQ9mZyCxxDyEY5p41Ts2EG6Nb0MPqG8PV2Ts9QosiN74tCYtQfx4XhMFmAPjnMe55yZr441NUHE6+anhSNriussNagH0= 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)(15760500002); 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:agVn3tt3K3KZwTltXJ3zfjZk+sH/m996QulLWSQ+I?= =?us-ascii?Q?UKBtPMpP7aAbl1UvDpgRb8UW1iDIuwAdrvHPlp5kDW+YFcxjSKR6GJc1wH9r?= =?us-ascii?Q?gSCSBoThP3lOqWnfnyyfmJxYRMf6tcHzsMzTsTpVU62Ebhvi1QaMOdjUBwHM?= =?us-ascii?Q?dUnfFR7A/UoW222jr7yhK9l/eCDuN5n1WtTLU+j2rCdctuPTGMNBTSXSxWai?= =?us-ascii?Q?OV4ZF+WaP2dBltA8LnFjgXL78Rxot2XTBAt7u6KQMnJtjXljAoH4utzJxkj4?= =?us-ascii?Q?V+ECqTdQDDGVkULLeeYOmDCyDzNUCuyvxs4D8qFV6o9a+j1x5nOSsfcbkD8z?= =?us-ascii?Q?NzOM7qbyo1Q1KL1K1qW81nQf150j33/Bhgol8siIdZwBAEMwl5DgNGgDu29D?= =?us-ascii?Q?Oe7k1X188DB5hzNGW6Jr1UGTJnGM8QXUoaR460d+yEu7k4ZjftQSRemtA4gf?= =?us-ascii?Q?Kv9f9TDEhIFyCRdnYWFxA+yb7BzFfqlWvPHpXcK4yaSz8AFR5bMDVo6tKn6g?= =?us-ascii?Q?bbxaE3+A5QgcwYlaDIGijQDbK1g05hX+mhiuId5cJ3ParAwrklGp0d34aa7v?= =?us-ascii?Q?tQ/eI336nr2gh6b3Ph8B6aJ5uKyBbpHZ64vdxRfoRBZmvWpIRM8+9ljuWPsJ?= =?us-ascii?Q?sCt/AVN1VLLKuSVGI2DLmAJt9Ihfy6x+V84pbYPSQN6lUb05CCm38B8TF3vb?= =?us-ascii?Q?XOQrOLX6ftc5+QrAw+jUvu1lhs/eT4oX1qMTAbS4qrC4hq+DHfPbzKBQQ2z3?= =?us-ascii?Q?GYUpUwtWTVE5+mjRsJ9rfSVuh0TCW+7JPO0zdLd9oU3VESAtnNMwfApoGFdi?= =?us-ascii?Q?rBgQbIgvoxIsUwrctE0SmXCUvpRp2MJhAQsWxb2un7a1KjXEIir0LYYugz5f?= =?us-ascii?Q?3Cj36xyH8R7DeOUjqDxPcG7ptjKLJDmT6kxeK+ZS0Zb4XTuEc4bkDnNh5Kdp?= =?us-ascii?Q?HbVe9XEisBE1APPGvuvB9v2I85UQoTJgMyXFI/kROvzA7IDzqnLG9hMNx0Vl?= =?us-ascii?Q?APJKtEcTjJYMusUCqkyTJ73?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:dvoSBnDZPtlYM8bTkqRZozSFDT4FLT4vQ1UzvnXeqY6eNQ25lGPrBjaiAEfYUWaDnmqzmlbEd7Tj3tqn9W+wAS16wZzUU4rpP4nbHaBoPQEIDtBJeFBcGw9KnjG+1fYy4Mgvt4/hSaqK6mO7RZENOUH45dxa6A5Q0co3G6SOilP0LI2GyZCxpEIneDSQPTOvM62OmirtNpF2g94vt4FrTkyM8p2yApZ5maF6Dv/Xs1aai62Na/aQ4Jz78/2qRbOJJ7cl8nmQaFSaFlEfGJqRYaaVxb+ybNlhM6QIO6oG+aIE1OUp+bc0NxgZuAYkFLLBxi02lH8bSaLycUYuc2KZWGEG+XiMn0frDsdG1Cvv2npckaDA4beumaXhWFrqtgrxWRM2QeaBGWdz5yKDaZ+SnG2w5pjuB4NlXSsTyCgijheWb4MMZNoCaC6pRuyiDYty4ggTi+cmGdRQTr3A+AISuQ==; 5:CUZNjxTqEirTzt9ikqqOpKvezBQ7aPpDm4MxPPuLwVusL2rW/SZboTQOjEspPnt3QgpjMzvRsuhRnsx7uA8v48pKpeFBoCORZ5lN8VsfAv4eoAbXA/y4A7Iv1wrarFZLSqj0YoYJSU63YGVSupnuYQ==; 24:lpu2dAUmGzh91KisD62+ezzEXX3/dP9fsu60DUp63HYRlP3ybDMTp+2ajjYSA+sFmejxl6WqgUU7pJQ90m4G1eM4N4tkG7VochSS0Q3gRRY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:XTPnc3FXd4978Bpm/iRPoe82NJ4I7l07bEPLDaBK3V97RTvEubnoqilxmv7C5lpZ5yGRw0yGA3CgtsCSTDTmwe9k7CAiiDtsiuon2a9SJDbERE8AvEzM/myw/gYu2V1g3XTK75PQHl2XehYJq0/MnwUPw2TEtIfnHgAQmdRJi/8No3Xd7zYODzsUXj0exwP+BmjUsvVzPhVJaGKQjRG4YaAmxYtIW5eWs9cfojEz/3wWEbx5VN0TsL8fZq3uWKtw6X2YoKYJS/eTTGOVOeFRqZzLlg+RPf1h6/RcJvrbnvzIzxr5+42zdP/6Hg7m4FfvV/QxThl5hLJbccs0qu18NA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:42.6944 (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: <linux-nfs.vger.kernel.org> X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index c52408055721..e61e4ccc181a 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -325,16 +325,10 @@ static u32 do_callback_layoutrecall(struct nfs_client *clp, __be32 nfs4_callback_layoutrecall(struct cb_layoutrecallargs *args, void *dummy, struct cb_process_state *cps) { - u32 res; - - dprintk("%s: -->\n", __func__); + u32 res = NFS4ERR_OP_NOT_IN_SESSION; if (cps->clp) res = do_callback_layoutrecall(cps->clp, args); - else - res = NFS4ERR_OP_NOT_IN_SESSION; - - dprintk("%s: exit with status = %d\n", __func__, res); return cpu_to_be32(res); }