From patchwork Fri Apr 7 18:14:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670093 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 8872C60365 for ; Fri, 7 Apr 2017 18:15:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D40428634 for ; Fri, 7 Apr 2017 18:15:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 719D628636; Fri, 7 Apr 2017 18:15:50 +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 0E3AC28635 for ; Fri, 7 Apr 2017 18:15:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932733AbdDGSPs (ORCPT ); Fri, 7 Apr 2017 14:15:48 -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 S932105AbdDGSPr (ORCPT ); Fri, 7 Apr 2017 14:15:47 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="186669742" Received: from vmwexchts02-prd.hq.netapp.com ([10.122.105.23]) by mx144-out.netapp.com with ESMTP; 07 Apr 2017 11:02:26 -0700 Received: from VMWEXCCAS10-PRD.hq.netapp.com (10.122.105.28) by VMWEXCHTS02-PRD.hq.netapp.com (10.122.105.23) 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=pWSeuzPxWnukLTOFzBL3AaX13j07ScfMy2jHsli0gLM=; b=jtV0ctUh4b+/8p1XnO7Cjfa+GktF8kWxRrH587mIp5efGCXJ2t7T9/HBCZGalXnVoKoff2K+zSif16WgGk27EUsRXR4U8AOAUM32z657esrSlXGGk3Ugesa7RnDpCm6jb8eUZ3fSefkr3kztPiVIc/SN2Glzwu88gtz1GEQu1Zs= 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:41 +0000 From: To: , Subject: [PATCH 01/34] NFS: Clean up do_callback_layoutrecall() Date: Fri, 7 Apr 2017 14:14:55 -0400 Message-ID: <20170407181528.2832-2-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: b125032f-187c-4bba-8caf-08d47de21a35 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:6R6Gty/GYXyRPyW9lmjTp3fqBF33GGHNCBv+jSL1IEAng8pnBrkBkpZPrJ6Y/+4zDiQeFgSan2KUYq5aw5V+HdKGbA2yKCn46m8/UqIhJ/+xLCC7BWSlm293cYAI/CLDJBb2+j6S6+gwZbgw5maasHisJS+fRKKxsx7XPC+mS+Bnez9MqkZe6P4sKmiIPt5zLHiV0yaY23ImC7dmNVvhfvIzw/IZdJIay2Z2HCioNQnvrHN2ghxGptlOmvIZ8y1DUgYnisdQWF5t7k1KiV/xGV/oRYEm+9lNg0JWudvFpxRaHuDCD17lW304w2fHujftw3O8Seji+vCesZbFrxt+YA==; 25:MMPh4sP+Ur7AHuFRISAjX1lX/7hUKvtUhJvhYd9OsQYphZ4UzGxnfBstOm+3E5Kz9Vf0lxEgIIKpomOnK3+HcsDbgDgZDd9tPd3C3MsnvVvRgoZE9FXUvBZSCTCo/DOV05Hec/9u8Op3wWQB2JaQli+5C5CRvs17ak/RmnOOMOD+rKuOX1msUbnbaFbRceyfiKZU4rLQhYMZHwo0+wSKmznY5LbU2nD2M47xzV0e+47SyK0A9tCLq966B7jmlY4QUiY3ZoNHOlwXdJMzcq7bGmXXCAGodS+iKq8lIEaPNZgXcaMgHFYGO+pUH/qjsfvuyDVLQFnZ57m2R9Tsk7539yKUBijMexwmgZhs2j0sQlcCeUebhkHrTFJX1vWhVvRH6KblxWz38/ryJWCbA3P+BIhaa7yVw315Xq+LMONh0GoNX+s1vTA97DI/ZSbXy9ShiNIsUzoTmgObkX4FZqEp1w== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:th58gHK1chPoTzxgSTi1YAkvJ8W2DZc8XtjNjFyo8sDlKWNgTEOI04DZAYPJtBIh0e/W8wPJRouCn8R2skeVxOh6I1OfjO4byxeLmZOJxhzANl931gQPipupaBet7OoNOX2uiLzP8VzjPwNydIHZf5ETMiGU/ak2Eos5vdhVe9kLVfwPhsEO5RJHW6PjSJO+ZmeSYw0lv3NPXnUWTF0dXCXquA5dXbFzOi4y8IfXLggqPhnxqIYQ6pZqxUgnvcO7LbKB6MOht5HMHMRq8Pconw==; 20:Orc34/UUUJuXnORPwABzKemzkId+92KFlHcDBrISdIoyFRng6JVC7MPoUVtY0+UBK7wEnIscSx30dITwK6pVz1TfJTaks15e6Nge8zZnvrMBz6xRpqNx3Jf0zfDoK/p1tPx27UwnaDxwFJhzzI/ERrEPXOBZSoLYfuPWKjd0EBkRP5nSNA9r8f1yF+cqH3vv2yjC2XDFAEVqmpLgDAZ3+ZLg4xTNb2DljKFeGISFZMDVePOlLD1I6lFFeIlcKeNT7/0FTpDcWGY+QnJED4Cfp5/OgsZplCHFtX9fBAz1ovn66KRlDIYLeA4XhOR3ds8mKp6zP2/80SNvAJhO26/j1evIGTdwnvCj9MTX0xUeZ4u0UZmnAcHMaukIBRmjAd/W4tQ1wKwjQ2OUWkUekw8KBfWdzAr+kLWVDW/GQI3Vob38wfu0BWu/6YlMEa7MPU0Yj6D6kv3QRPYF/4l4Y/2CqmJ4+p2hsjLYknnlvUyTIwAt4QifNNhe4cImRBqCzoAK 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:IKa2bp99f4JQ68U9hfvjWGrqNrLqEd6VQGcXvHHK6E8QwpbWYxns97VHTNTDfDC9LjA6vCsmEx0lIGy5sy1/8/wDojyx9rT/rgUh0DYsHa9hPX3xO8tTGpVwOF/d2Wo6mb+RnhasHtMBD++NWYUkNP2lJvKLJ6NLV0uDW3l9P2XgI6pn/mKRH/SA8xzh73me/Kt76x8N0uLSf11RORNfyQcKpl7J1l9Ob7AC5xwOvOoHZqsjHIWccEDgYrJpWvspQUa1VpGvZ52KkAW3Eem2cGWkOdOp9+lydD2R7ZGYQYuYyfILPqKXUJrdkCjxU3XDfBynDlc5JmSj/4+z0KyuQqt1cvXDrFXt5R6u1aTLN5Oux257hlNVZRPaETmsG/eORNwXstIJvxbwPYhpnReDpuhLGk/EA2E9HONaMs1q0M0IVraVEqjQyWfhtVmlr/Z5Jzy9qgsLRKvog4VlRs2nO6JoKxEodOfqUuDu4OckIgtSYVTy9wbzpj1VhhuZcT8D1/Mi7oIlPD7z5RsIQN3P5NUmBB+jSfYBioYusvp6g3CKvirXG0S874Sta+vlQZkpNrCgsq4VkVGmnH0mwhWI2eWeY5gso6YfGh5d/iK+lVi8kC0AJN8Hl0CVYLXK+LIvhVq3jVnqgWNXe4FNcAFqoiU55rAffo59RatWhj6Jh9wDuK6Wq8qohgyEKTwaG7Y7+kcUWTbmzyIXICL0ClhwM/1EmMITOFUlPjBoC2WanGU= 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:XmebJDICsCCXb6GUxkR0x41+0BnkqdRNroSsYCdTP?= =?us-ascii?Q?HHv2KgTUGV7iq3k5mV/bUNbJoC8RmCpZjsKOiogDyk0xbxhXhRCRPKCP7pPT?= =?us-ascii?Q?2pfedpRhbs/o1mTuUGdkeqM6XTwozCwuXePFlOSi5VmT1PfOTYtbbE2vUkuo?= =?us-ascii?Q?t50gWbVr72wExDMifhKoWug1x/FZhAHcHccy7VpkYnqSWrrXfVMlVSNEpott?= =?us-ascii?Q?oxXz+zJ2B4cv5lmi+c0vuiAPU64I2iEKTS7bldA1etSEl+wZOm55KOiIevQZ?= =?us-ascii?Q?SEIyGDJMg9aXPXqg9fNDJyqJJG4TjbKX9O9nw2V1j6Q/uLuUGu3A9wWLBGed?= =?us-ascii?Q?vZucCe7ZWJt8DxioSamBycdj/l4VwJlfU2JGDGbHxES4UnFATeTG6hPyu5cX?= =?us-ascii?Q?YsF+imLfeooGVRNZl25Dxt3UdbnEAUU93wolBJzTJhIXGWdcm5fPXyAKoOG2?= =?us-ascii?Q?RrnTDshUt082kWLEoR/Prp8ebl8pQ+6n6rvvaOT1Pkoayco6UqdzVf69/ycH?= =?us-ascii?Q?lfVUEezBDZoQYCdcY4Iwrtlgl9hpJxp3JNtwdu6MZnj4GFBGLkbCZAk80AKs?= =?us-ascii?Q?M3rLWVY2zFq1+Et4gi7YEyFLa1Hlrb8Xom2Vc6GXgIdmIvBvvoIzFbZEQ/SZ?= =?us-ascii?Q?dic+oANsHIokt6s/+0icUPdKSIo6j0lcZfVeWAG2SHoPR5DUCkaWxikG4apr?= =?us-ascii?Q?jmKwLoQTjmXFyYfMa8XPIRyGijeIYgiHwVYS3oIXRgMpBh0fsoQHZA96DCfz?= =?us-ascii?Q?+GJOdRre8T3p+tiL0SMLrB0l6rJKS3GmTOoqITDzJ5h6Bi/Nit4ekJm6dGjn?= =?us-ascii?Q?isSlWzTI53i8Jpoc/UK72Sg+ThuEEpRBbUr4OcR++yDF0g7yUbL/bgN11ELR?= =?us-ascii?Q?It4VfeXq1ZtksNmbhY0lznJejbHN8wSPZ+a/qFuf4uYMGIyhoqxj1LI93OlQ?= =?us-ascii?Q?40Ypgxx3wSttC8fQJU/sTXsBc8GqURe/loLUzQgVlREqeO5ZinvdohKXo2y/?= =?us-ascii?Q?YM=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:jes1C59ljzeR9QSZ+uH0aa3TVarsfNB9jaaTWtB/Hkxui6bw6+wqflCrBK0UNBnZ28enF6Jt9GjvZ01lEIIisg0vxxV8caMx0LVYav8pyau0FvvjYsVYItNbySPUxV60I2TbNXwcVl2HiWDLg9RXl1tWtZkilHHeFSCI6UUokfd51KDRvGPhmrDOSf+TPnimun113pA7Cb34gn/M28FP5bb+dxNSnZ5c0eeHc2yXgty9Yf2XoTkKRRSJTmIQHLbaEjFROIlHGKTNynpMDe9TCmNpEUAe63ZL7ejm6KMuo6FaQucXdrF07UroxNyjq2UPWCedNgmt0De5vVeKBH8QuZNjaCu5AZnLaZz/ZwettE4XSS9gEBrWU0I398gj3qQPdgD9giFB1Qaeja47ypZroSNgbzyJl+oHx5rIl3Huu5X1EHZfNIJ4rWrsUhmQrko5ft56hJpVEh7CQ1/eZmlb+A==; 5:qa99vxdStguP5E3hQaxGN0NPADyTDl0OVflKNnz5DG/Hw4K5mNfHMubVl44VhljlT2N77Z/SUYDhZCZQ2WXvEcgLI9V3HKNAVt0ct+2PvaIEF4/uSE3G+IQYCW4A1ohjycEZg/NglAdgdWIwkbnqsA==; 24:TZBguy6h4/dWrGPY6K9ePdF0rrr2bNrHhp7S7aH/SvlP9r7Q27Y0Rbk0bSOFObf2q6m1BZsrXQKWKkg2FfXZZnx0VPqpXdsXchSE6RA/thY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:7e9Rl7oTqDLoywtSeWvBYNCg7aNx00pCS2m9e2GN9rykkFWu7mfBrH9zoUMHzlo2w/vMxxLv7+BjiP0KDjE9mxDme1lB8u2lMySTWivAD5VMyichM2GAiS4g5MDNkPRynTA98tpGNI0ca/excmT6M1mnk/MhruqksxYL3/qj/LOWdNL7ahXvc+XwqLi9wEw6d6F3w/tD/eMxtflXMs5nIXvxg2P4A5nRkiOnYjDZKtK6zLOGaVl5aDpMhIqXepEMj7lJBrhUts7ixgP973H6GCc2hWrj6TJLpWwyt5PbG/1lG1NBe2D9P+3yQ01WI5co7jaw8xlCeGhWPu5wKb0H+A== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:41.9058 (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()s lets us simplify the function by removing the else condition entirely and returning the status of initiate_{file,bulk}_draining() directly. Signed-off-by: Anna Schumaker --- fs/nfs/callback_proc.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index f073a6d2c6a5..c52408055721 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -317,16 +317,9 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, static u32 do_callback_layoutrecall(struct nfs_client *clp, struct cb_layoutrecallargs *args) { - u32 res; - - dprintk("%s enter, type=%i\n", __func__, args->cbl_recall_type); if (args->cbl_recall_type == RETURN_FILE) - res = initiate_file_draining(clp, args); - else - res = initiate_bulk_draining(clp, args); - dprintk("%s returning %i\n", __func__, res); - return res; - + return initiate_file_draining(clp, args); + return initiate_bulk_draining(clp, args); } __be32 nfs4_callback_layoutrecall(struct cb_layoutrecallargs *args,