From patchwork Fri Apr 7 18:15:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670115 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 4DC8B60364 for ; Fri, 7 Apr 2017 18:16:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 440F028634 for ; Fri, 7 Apr 2017 18:16:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3902028637; Fri, 7 Apr 2017 18:16:05 +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 D462528634 for ; Fri, 7 Apr 2017 18:16:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933753AbdDGSQC (ORCPT ); Fri, 7 Apr 2017 14:16:02 -0400 Received: from mx143.netapp.com ([216.240.21.24]:46795 "EHLO mx143.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933181AbdDGSPw (ORCPT ); Fri, 7 Apr 2017 14:15:52 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="186183192" Received: from hioexcmbx06-prd.hq.netapp.com ([10.122.105.39]) by mx143-out.netapp.com with ESMTP; 07 Apr 2017 11:03:33 -0700 Received: from VMWEXCCAS11-PRD.hq.netapp.com (10.122.105.29) 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:50 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS11-PRD.hq.netapp.com (10.122.105.29) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Fri, 7 Apr 2017 11:15:50 -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=FkzmnBKpOxbjH8M5+xOilfnAhhx5sm1KTQMWoRjsu9E=; b=VkKo0P2eP4Ff3KLJJpE+jSJQHgWnakNiJaRW8k4OLqz1qYNAsMokKe0TbmF93UYsCGW/v1pJhoU6VrVMBEc3ZOHRJMpWVxijrwozktP4FDJJ9hYWJPF5sfOLwrOviEJyUw7YMo+7cwLUZ1QcRrmt1d57CyEg7Ou0QddGlJvFME4= 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:50 +0000 From: To: , Subject: [PATCH 13/34] NFS: Remove nfs_direct_readpage_release() Date: Fri, 7 Apr 2017 14:15:07 -0400 Message-ID: <20170407181528.2832-14-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: e3abd0be-0e83-49bd-a00a-08d47de21f14 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:irE+6+syt8G1mQkO8G9Xnnq3sM1LjBbaBbs36XZdXfMD17vwCqvqL2IpGR62FidSrys2/cnXL3WfksD54QOBwCxj9Bx0aQrWXcUULtZZci+R6qJbSQq9OSSKULfDc4/VbtKTvy5aBT12cnRqumJrYnhe2RGn/x5ZCWdn6Cs8j5lDa/ys39pR5a5qHIkC5ABf70zmuYtGQTTXn12VwvrWx8c7cmrvle52hmHmbt1Q176AS/58a6QoU+zDu5tGG+rWr11EB0Bo1eeoEc3IYCCTjaBscbaB0a2Ir2e61z6GnmCv+WhaHVCBm/NpkEUkmF32ZbTWtkGUkiNCJRuCcVsVNg==; 25:0lS09HIvCnkgLiyfAhiwn0r+a0MeCAXMGrcj8W6Noir+6j3HvzF7k9QTiw+ETMVpl6+YUh59KlD8Er777R5muqCOTeGF9PTyf9P70X0DrWcnJacRHiWwRU1F3VgLiYP1IavZBM1Y1xGXNwfoIz72o4Lj2RMq3B62hoyluvC/NhxMzv8PmJoCJbDiObNkNoU82l5daVd0d7g1+luOcxgjKOQtyvpJ9OriiwcwXu0GUUEO+zfQjNDtawBpYiEWXpKQe13J+wSbW7SId2g3DCQ7g0O/1D71YPVZZLN54TbMuqbTji66PJNvJok4rkePosjpBSqVCKE8ZodQ8zkFQuFVRuvhI/xYiCaMCODYYuuqq/zWZecv0GTsyJtLp5NuFn7h9Ol/YVwc4k+2mRfL0Ij2BL9nwjEYtmPUGbHowpjuFq6TWwz4njoTRWcy1a04Vsc2 X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:NWZ4N0IZ2YkZlQbFOT8EsQXd9Lb5uQHPI32QcUZ2kwzMqAwqiC0SNCBtkp5ce5nptekQqJc53B26XmRpHSY2JSHFVuEXuRwoXf3NMYTVLS0z7TaC9l7TJnbj300/UjFy0PfPlVH3jWV+QbNr2ajrCM8kJvXM2xqyGpHSl+DtOhwPlh5cOLccD5NECzeos5mqIlJmfWXm2ritzDaFiLMbtS9m9FB4OeeqOCovWZ8otdfeBP+fqull9Om80AORhitR; 20:0ypYTF/BJf1PBUj36pC9HgARsgQ3MsHwIYOfP2fgsC3/w+fnC5G1i/6BWzuxvc2RSPpwWedl55KQzb6FcjHdK4dAZjSRNEex8ozwV5lbV6B5m4A+9b2OKUNkBRvwpCDVvONGQZ/EVSFJ47x133d2XFTqPMSORWkYJlV54yRdqdLOod7tPAAeZJj45gvTTv2z97AHRJzPyjrK5bUhMzg9g5QvD2z48kUfuizypa6VPzS0NR5/d0pgG7vtqzhjgcUMno3Br/5uZdRjO+FobfHze6YVjW2bUvLavHd5oMF3sDMlW3zc0XW14DkvvNY3XOhtp9bQars0TxMJ6c1ZF2f+LQmI9a7rXOWsTWtRXZTnyvSIx+WjZkgoEkbA/1wxZniudIPiOdQR1p8SnODeHiYJXB/dKooaPfCVTA2hv6aXIZWAGH5faGCPZglxxMXuwYHbcP1SjO/ua71DxEv2Khnc7wrVgFcH5h2woeZWmoROQNPnhGza2NQ/HtcuXzURCl5o 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:mYtTn7rmhwrEfVbZDFZXbVnwxdGm97E23po63Fju5PH/MDXvIeqk5Gdx7tOIshMTf5P2MbJuPL3bpXD4hTAjWDXldciMhp7+7JPWeMJesBUQMJugZd0IpdQ7iStfqp5Cb/faCucoHeeVWekLEV5vsCzmvbBNC0gEVRcb3Gf6Q8+fztp5tCPtwVnkrWxuj2jtc2gstT3u6A2Sc4chiOm7SwMgPrYjgKKS+UA727PsVVXCbVuNM7Wplsw89Nz5dqICy2yxsDq+QralT1wcD33sYae1Kal7mOIGuF0I2TVdAnWjgXE5VrHAYx+yUkGkoNwGGZqNoLDMCDCqDmL9Dw4svTQIc6m7N9c4YBaUCYDwfoK9XB7H/FrvqKuGmcDAdZwqJ/h3cQUQyXvBC4MbLgndkTJD/l8NIgA6fHB4/sC7Dg5NxV0GpJw3Jc9RP08BCXllabgClDhMmWUeV+uVQnx+UhS0kl+K4llJ9QwO0Bik1Y+8eH5G0LI+0gLtXKVSVxoB8MRc5ReUbhqkdTimRoYIJJdPF2tHoaVCff340FpDl/XPVyCY6XLldTBQnN2BZAU8VWb1jI21142t2fWs65UrwnZdtRa9YLDk/fqoLjDAIAXOnVtFvvFFOtjVhgqCeged2gQrv7lUmRIPvpEH7lI5+LixQP4Sd9N0kpibsPRc5JmTfnQwAFrwlLabndvvC66EcGyYb0IWgptqwVYqw7g8mGZCQ5aQ1+Q9pbjdaVXZ4HI= 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:mLM9s2D6A2VsUdIcjPUeGK5b9M21UUPgtRXWeIuz1?= =?us-ascii?Q?xVyLTBZ4UYdJ30b8b1wDePqr8jV61bpigpbDW1LO8iOq7qvBuD6F9Rlc/yf6?= =?us-ascii?Q?mdV6YLtxxkLD5TIDKDLpysEk63Wnd7tQrMUIDWD4qICHutob2+WwAaDulqFS?= =?us-ascii?Q?WgHDuSFCx2kEVxSQkKbS7bRyjl3vZTBdsjo9XhjS3V1rvd4HugbokX5AeUgd?= =?us-ascii?Q?/X/H+f/0v3gTuHj3WpJ2mhwtxkHQXerSIQfmv5sUabJ69A4F81Ijb8UK1zP5?= =?us-ascii?Q?s9B1JtduoS4BOutXBR+gkaZsbxMET48vPl2B/Yd0INK+6U++Y/3NHez7F9Ya?= =?us-ascii?Q?IsSZLuIKVdjZzZaOKedIXOrKdAUISOkTFWd1Ic8yv7xSEXKFtULKr6j7wvXG?= =?us-ascii?Q?/9TJ2r1v1fsig+Yc2fOZdy23Eq0SP1O0rNUUQ1gz0V+LwdnkqR8ubQlrkh+9?= =?us-ascii?Q?ok3tBCw/qY8P7H9/Pu7lYgDS3WzFWFd9TeYh0j3jDwnPEZxpwllRr40OPcp0?= =?us-ascii?Q?LMhHl176r4ERZUfZyQ/hz+rkjD1GHuq3QBIbtsBVQ8Ci93K2K0RdeDCKbgF2?= =?us-ascii?Q?lWF8oMUGT2wdKxCptQ80UoIQOLi7Re/k991+bL+c+5gaVWX7FOqvXKY+81ws?= =?us-ascii?Q?Zcir/R97PKuKFY9mYls9Dx1aaB1X6A5YYNGmoQDWggNoLiQKtOGFEMRyk5gp?= =?us-ascii?Q?BoWZ6vIHH+uiYsksf4itb1Kw0M2NganvBPTmTpyc6PEZxz0t/wCmABhra+yD?= =?us-ascii?Q?DuCUO0KOJ3+mNoLjH4ktWoWPP4rmBjio/HCPTFeCWKo7Aj4BJHh3xyr2eRr2?= =?us-ascii?Q?pQWm5tCL0GqgbhuoNPqDL5fff5F2POKyuc26kFYKfsfWlBJUqhOlEkXQaQb+?= =?us-ascii?Q?8zb0PHAF5T5lA+bq2PUCB7V+niGjoAppOpxIvgmQZbq3xNhdLwnH2S7LLYYo?= =?us-ascii?Q?Q0Zr8wIT3Aoi8RAjdLjA9k2PgC6HRaxVDh8DoWLqw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:4LQEPG8WM7ai92WvcfW2yG/qyS/O1yNa+x/FnJ5XlwqCdoYL9Qxe+P3C26/2NMyIpDhFZNYD0bs7ITMNpiKiGQGJtJyOxO1GA601nUm0dGBVGLpdwP5KZRSP5FxzURX94JD3w1FhO0mhuDXb+RLFriFze4kR0nQMgVJPhJGU5qupJd1KnxU1Qnj/bZhnJ8JcCbeIMbB9nVRzFirKVghl7Me5RAKISXxJ5M+HVFo0yf8qbtbjGO2lV1DknOAcRVKfYQk3i+pYGPduuPKQ25yoLrDdVUnT7l4nAjyHOpEXU5HBxgGWYuIYa8Osvr+Tf52SIfV4jkXJ0zBCB0pUT9bSAuWAVpBZ/or49rrjCOo9dMN6ZyyfCnGC7xkfakGnlxW8XGqROUhebf7+DnBMLqJsaxQZWwPsJLy1s40i91W5eXZcL/295CsGBG1N48sK+OIAHtPPzicw2Xyr6/pXlr0HNw==; 5:pvp8t3rHhf05LyvqmQeDw2klDmF59rnApVUfwl+wQSXyalGErr1H8fhn2a/VHfTH9UGnaa60qWFamZOp+c1mgKNueiKErEWD/yzMgzEqZZSWYgSptkPk6RWvU00/3bJQaeazrUgSiG0QD7SjlqkiaQ==; 24:b6WaSwAyouQK97oBfBI1j/3gBfViw46uKxqqJW3TDdQW6kLBG6lZJT+3xr3zRrSlmUCXUZFSxibe6ho9YTsxq/GcyHEW881wCQp+OqiH2ds= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:aEA2k0IAiNozcy2XYZDJGmp9WA27l29A2/4BtuTJS7eV+FPJZB+qJrf7zCXPK5/B4x1SyvY902KOYrYEO86hKO/+c0rAO9vTawgzlKOqUTfLSNqbOeN/gv6ZwFFjHQPcNaswp+Ep8CObKygWsz8mriTpC0/K7cZFX4joLYkOA17heY24w7DNI2XaZs7DJX5VWjfJYq15EzaLHKWK5EFHHtCsUQ7TAyhvca+Zlzhl3Vxyp00TZbtw56r7QeSbCxhmNDpWi1y+R0Nos1PzDrc0TWb2pq0+A/ravSg1a9R8cNthhVbNcMtZeUUKruYZ62pGbaeuLJh1QVy3s6xN2CImgQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:50.0796 (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 Just remove the function and have the caller use nfs_release_request() instead. Signed-off-by: Anna Schumaker --- fs/nfs/direct.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index aab32fc3d6a8..0b65e25b71ac 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -392,16 +392,6 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) nfs_direct_req_release(dreq); } -static void nfs_direct_readpage_release(struct nfs_page *req) -{ - dprintk("NFS: direct read done (%s/%llu %d@%lld)\n", - req->wb_context->dentry->d_sb->s_id, - (unsigned long long)NFS_FILEID(d_inode(req->wb_context->dentry)), - req->wb_bytes, - (long long)req_offset(req)); - nfs_release_request(req); -} - static void nfs_direct_read_completion(struct nfs_pgio_header *hdr) { unsigned long bytes = 0; @@ -426,7 +416,7 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr) set_page_dirty(page); bytes += req->wb_bytes; nfs_list_remove_request(req); - nfs_direct_readpage_release(req); + nfs_release_request(req); } out_put: if (put_dreq(dreq))