From patchwork Tue Jan 17 20:32: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: 9521883 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 383B26020A for ; Tue, 17 Jan 2017 20:35:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29B7A285BD for ; Tue, 17 Jan 2017 20:35:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DFE3285CC; Tue, 17 Jan 2017 20:35: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 310B3285C0 for ; Tue, 17 Jan 2017 20:35:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751292AbdAQUeE (ORCPT ); Tue, 17 Jan 2017 15:34:04 -0500 Received: from mx141.netapp.com ([216.240.21.12]:13901 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751184AbdAQUcw (ORCPT ); Tue, 17 Jan 2017 15:32:52 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="177298224" Received: from hioexcmbx07-prd.hq.netapp.com ([10.122.105.40]) by mx141-out.netapp.com with ESMTP; 17 Jan 2017 12:27:21 -0800 Received: from VMWEXCCAS04-PRD.hq.netapp.com (10.122.105.20) by hioexcmbx07-prd.hq.netapp.com (10.122.105.40) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 17 Jan 2017 12:32:28 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS04-PRD.hq.netapp.com (10.122.105.20) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Tue, 17 Jan 2017 12:32:28 -0800 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=SHbpBgbMjtnb52hEh0L+7bUeJy4cy2457u/MU1H4r88=; b=PUhxm3hm9V4V7wZWWtyCy9PrM7sPQOSX7QLMPLdf85XcRMO2k2RSY/eq/i0lRy+N4+4kYSygTfZC6tv53Ar29puh7EcjaL5S6hPzPQSOIVPz5OLVl86DS5f4qxBPV5EzKT58e1UeA7cFdq/u/at17wcqP0mZ1QLMKoAUeKhSfik= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anna.Schumaker@netapp.com; Received: from gouda.nowheycreamery.com.nowheycreamery.com (68.40.188.1) by SN1PR0601MB1646.namprd06.prod.outlook.com (10.163.203.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 20:32:26 +0000 From: To: Subject: [PATCH v2 06/10] NFS: Remove nfs4_recover_expired_lease() Date: Tue, 17 Jan 2017 15:32:01 -0500 Message-ID: <20170117203205.29033-7-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170117203205.29033-1-Anna.Schumaker@Netapp.com> References: <20170117203205.29033-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 X-Originating-IP: [68.40.188.1] X-ClientProxiedBy: MWHPR09CA0042.namprd09.prod.outlook.com (10.173.46.156) To SN1PR0601MB1646.namprd06.prod.outlook.com (10.163.203.140) X-MS-Office365-Filtering-Correlation-Id: ba6c944c-c8a4-4afc-f0c5-08d43f17f380 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:3G7MMG4Zav9Z4ARyiBndREE8toQvfZi4xM7IisVMJxKniZU3lKWoWVJP8OUGjvuMi2ThG82/TXnaVw8JX7W+/S5MYfSGyMiOTxs2VC26oa58t5vvCHOiI692wSwBwrJlFvOzaaYiG19naNgza4IUgIdBcHABHxm7TxMe9iC7hNH9a3YyvqCH10Y7s8INBB4CT6bSJYnON8SSFqz0dgfXfqgKsufPW9oyoS78HhJ0f+rMZiy8J8FOlB3lNSIaz/clvs9SZk5HySr94w2JRD/Njw==; 25:e0TWNeSxwyZOudGRiJ4HUVlYl5hnddB755Kren6idPV93aXSyROkcx++N6KCy/YGCK8HlJ522o7G6GcDlljvx8SyM6WspBWABy0FEAC45OyNEsks9F6bWFIlpypGDKd1tEAXOHX0IPOsA678w+GpEDPgtxJ6RKLAw+Af1yq91/YbNMthvS6nWbaO1ncFbtbuJCzvVr4aM73RnIlMJKZNzrQf7tSfXpm9ILuHiwQ2HxzxDUVL/eMNZfm+VR9+YyIoPqneOQDPawynzv0MMzPpfK5+oueKKaIr3JukhUVDB8y8J4YHUG3gDspqxDWhcy4fEPIfkfZgx4Jc7U2QEhfatX5J3XLsXedhkv6THa4t8+6nFPJGcHNtew2JK/pKGQICJxF8UbGjPr7ntWOdwIpFQL6zJuW0wuR0A0RDHDdrOJfiQ4YgN/Ge3aNsrBPmBYs1votvDOyS81xTiz5oTXY2kg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:bPKxv3niJxAghbv3jfEcmYibg8VlhmYQ7j6jy7HZR4OUWcGJ8ReGw6LUryY0k4f2GSTuiMkU09sNe7D/STeHJ9N12EeNgDO7fxMumd6gzQY9d4y0Ci4i5AF8YcXHZkEotI373FlHJIJbHjTHzU+5cEacmsPOUJxbtVxxT9Esa47ysORwznXXyskkoNulHFDwNtpDQ0ewHJulAgoqWqNhnSOeICopx+1vmhL3HDu89XALAdpW3f3C8FJQcPZmGvN5/BVOGcMHEPYwbMT2Qa2U9/lkZTpeV10Mq/ejqLZzG6o=; 20:QPawF2nGR93PCPBDfIV1XElD7vLZvg8FcTT3BcYnOREQtNhTrMWL1Din4ezK8rYtEupAAz1lSGnWmdkijiOIzw/NDOjwUXHQHlmt6xOu4chNCcLz9tiSHu0qGJmI7rlLSHKNpRtC8R9ilbeSGYxGBc/llnkBFJ/DhV2tBizEV4wRNIHVYkqXPHzysA+WHWosZWktytHuqFw8G3xV6YtLW55hA0PcjQlKp3gh2BY2g4Vd+oUvEbB6v8MTuon37Tc/CCWXGxZ4/3yEnm4FZTVNuHwn//5vZVrbTa6VHFS3A5l+G7KdFaHYnOBNwRVn9WgCRmyBFdHKfoFDJCurkvswGJhW/sYU7W1Hqu9TdMUhcketTIgtODfjYgw+IiM3EWJpbf/NKUXh4YkuO8wJS2WH9TepUXkubYEnu0NMe5jJpeOayDDOQzZcmloaIEmugt54TTPlZ4kxHJss55B5mq5AisNX2rUPIBJvk1fb1nJh4XYSMV/xeJry/f9KtFjTUdiE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(158342451672863); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148); SRVR:SN1PR0601MB1646; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 4:9rT4UhlDQm7HWr10zVMtLeFAXtXmrfNLOkFPLrZV+fbRw7h61qYESWwHTqxU9b+kNv/4dwQ2BdMewjwEz5O/jk+ZI6OLDs24lDZNeAfk08M8cnqvJGD6JUa6gFMYOQISmpqtUegqkX7as3lJlTOkhLAuzYp+mAWsTegp2gExQVFhRM5n2Y/ir7p/BFyHtBuFPhYtOAqW7ScZMOfTJzxrXT374GUjW0r7peO0tQe7CO6Cba4rxaoZum+bIWxjsQL49hQaSOXhPho+tfUhF0fxLNo2aA7tP74oE5cgbqR7ThpIwC6vnk6KGvRSN7tu6pXYuixX/F4xTc8hKY2UeXcqRodhDDIr1/DThZ2/PnKNjeDeM1FtKzDr9HHwzVTLABBfrBEe2ngAXoKC+3MVP+BWYur+JRk2NaaHzoj7pTFQ782I3470ovCBhxuSyj4D/PeyYyvkacqCU2Z0/i99dG+yBwpoQkzTvydKUUVkUf9+Xcp2BRnbhs0rBjnM/iXhkhCtUGMKXlVJdDfm0iTSw91Qy8F3845p8n9NCgRcAz/YVVE8+Fz2ozpx99gQlqtzBaMCYhqTHTILhgRoItwvpQ/bqmPqkTa4SKtHezeosGVSrqoetT5+HLbAeq2JpsyP+kx5 X-Forefront-PRVS: 01901B3451 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(979002)(6009001)(7916002)(39450400003)(189002)(199003)(50226002)(107886002)(81166006)(97736004)(8676002)(81156014)(6916009)(6666003)(305945005)(7736002)(92566002)(105586002)(36756003)(1076002)(53936002)(2351001)(68736007)(48376002)(6512007)(106356001)(42186005)(86362001)(50466002)(47776003)(110136003)(5660300001)(6116002)(189998001)(450100001)(2950100002)(6506006)(6486002)(76176999)(38730400001)(50986999)(2906002)(5003940100001)(3846002)(66066001)(101416001)(2876002)(25786008)(86152003)(15760500002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0601MB1646; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: netapp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0601MB1646; 23:IZe2QMmcrYfRHmriZ6cYpVmMA/8PDjAcLDN/b9b?= =?us-ascii?Q?G44D8RzEqQoTUxM3htRDgWFym7F/Q0bgFo6dpKv2xlhosK2hA0ml1+T6Odr3?= =?us-ascii?Q?TCca45CK+AlcxF8u6FXqe/2dTqmm/9K4hXbi7ifFacw4ULQ6Y92b7VJ/j4tn?= =?us-ascii?Q?FfUIoGrcCKaWQcisY3epI+jrElvxtluH0o0WzrT4ijDnistsajvklsouhhDO?= =?us-ascii?Q?u3YH2fj9ROMARQosDs2uEJhA4Sn69MsIv8Up4n+pVI6chixp67J9sk9yl/uX?= =?us-ascii?Q?q+t6vjDBYIV0vXHpVQK99gKi5SJ1puhChrwE9YVSPKlTFoVMG0/WyUrBioFL?= =?us-ascii?Q?lVRvs9Lok/3TlKMvWAetVDV++/ID58HQZ7mso5I+pStkTe/TyGRtxEgmXTkW?= =?us-ascii?Q?VkidVxGwLxvlY2BdL7i229zPScWtG+p4j+ls43fxF/lVUcNARl505jjHEs1H?= =?us-ascii?Q?gIqe0BN0SrZY/mgar1U66FQGU1AvJAtFS59rocbKkENqTvYgD4G0CNmVzJ73?= =?us-ascii?Q?l3JrMDiX+BOHVoMGQ0sFX1PrNrvihYPqt1wefQAADofVohbCVxTUtZ9fsuYu?= =?us-ascii?Q?LD7aVPlfyCJxLwfKqU4ezQl2ul5Ok/NHm1voWZpBMbwiTfB2FgFCRa9z7OD+?= =?us-ascii?Q?TOm8NQYmRDLe6FE+9ELNKccj51NZFsFexjT1ctaG7xhKM20UUNdcXHoC67O6?= =?us-ascii?Q?nnj36UoF3vzfGYZqnhzhdm85SvM5PuhhpZQgqhOatkQQgDTbYvBn0yUFxfcD?= =?us-ascii?Q?bTuYUt9x+FcT+bJWl90UH+tZzhC9hvI9GmbVLHU4QkbQqllMkr1zEkl18ePi?= =?us-ascii?Q?3Iw85mgg5gQJeg4iu3/r1IAS9B+pIxounXa7q8m1XkSHJrS7uqdJDXeFYPew?= =?us-ascii?Q?mhYGD4M8KVxfx+IrgG5a5L1cimO8j6lOb9xXB4r2QmTxai/GTpQOCPIu38hL?= =?us-ascii?Q?BMMZ4X2i9FkgcAjg3fMlY7qGseFo0LrcYOrUC439JzhHQjADanN5d1HKWKce?= =?us-ascii?Q?nOsU2vteICV+50cBmZeCzNHOsYxhC3p1ClL6HSykhZLQ5GKZG7FeuaahYnQ7?= =?us-ascii?Q?kN43bNNfd7p2dGUk9ljlv1EtBaybbJ48CTqpGOzp0gjfE6E+lUTPJlmcfM9V?= =?us-ascii?Q?OGQaAdGs/fMpf12BJJOJoJdA0lnqfoN+WnAC6xHdMO8bOKqxkWtLWf+t+bci?= =?us-ascii?Q?pQB9MYXa7HUt56Jk3moU05JyX53dFsn/lFSPE4NftS2kDP913GcCSn7CnPed?= =?us-ascii?Q?eKmcadk6B83DDkgo4JTPrDqfzZR2kbPD4DgR1W5Ua4BbeQOuRLqHzkyqRcUj?= =?us-ascii?Q?fCelSDnu9CmlAieb2pkxC3HQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:S5lc7tXnwv+hwXX50qy0nB31ZW2Vn1LkR26lKEY/GpjjTuVXTcmlW88GqAz8p7kMt2VzK529dF7jsLynBHBgeyAB6U3RwAttD6yNKFbBWYcnP7gTprMC5JKvIcvHYVBiWnOyU9ebbL9pZA2Y4qm8ZUmQM4kephKM4EHbm79tHCLy7iqjnZEJpIHCYT+F9ZbIMikrnZjb+vY3eyCxPkgdt3m7pAQZXGS50gZeNGxTzb/jbnksFdoENU4SclMPbylMT0usGln9WxchTjMHLxTWrqhKzRQ5qOBaYvUb7olN0o7LZM0a95rGr5D2x8dyB5sFvDDLgn5KkI0WqvSnFoyZnvbuU64s8zoWODiFdGE5DU5EqTr3GO32388M/ZQsU85BFEerC8t67RHAkApZ72kfUPlr+DEDQdvdxkSnaZvwtcQ=; 5:2TUlD9msgkniBSoE6lZktjxRfiL3PIJ4zQWpIqJ7HpFQJ42ppsACYGenRzLmBuyNSes2Ad33/W9cVQ1qQO8WMqQitoJ1mHnMlIUyN1PxS4jQjserSkNlFSOUYIinaPBWQWmRkWT9G8HgMMU3bxzskA==; 24:Ya9P+/2yg6wYJRCOaGwPal6sI8ekltmScuMDbgRon37bi9Uho3kssgWLO2nQOv8ITT7BCvSAffShRFvTLRxCDkqLRHppYAoisRj30Jr9kN0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:54wQAcqVO5jRh74ullE95XloxopF/lofJH3NtvWleJazuFK56igXOOoEJGrfDmaz6sztCWYuTR9jEb7CHVTSn/TOVZleFxiAgM9DRUU5eH4B1DQqdA37LJLClv6rJ2zP2Eo873dncnPdHbKK4Ni72919aQHJWrZKj5yV1CrAfc0K7FTPtDwb3+fbtWlOnpJt+3m/gw/aU74ttYxpta3yAQvpiWd5YaD6DdrVAbP3tBxznfLzXJhai6o5qMGySCooRS6lrVhY2uzEwQECmD8ewA/0e7T8m0pBWeS6BJ7QuwfGIa5nLTbh7HjTP5I5lx4jMxXoyK1MvEzC1yMpsxdJhychGlwMS7eVKpIImsY9Cnw6oY6okOGIGUzoQDHT4fKEKk/buVYC0Ppsf6jP0S5OMCl4Ur8t2913MSyHb7a7br+I75f7OQrexBb/7qgbKF6vhN2CLrpDbfoRxBdUOXkFgg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:26.4710 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0601MB1646 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 This function doesn't add much, since all it does is access the server's nfs_client variable. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 02767aced45c..bde48f02bd28 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2308,11 +2308,6 @@ static int _nfs4_proc_open(struct nfs4_opendata *data) return 0; } -static int nfs4_recover_expired_lease(struct nfs_server *server) -{ - return nfs4_client_recover_expired_lease(server->nfs_client); -} - /* * OPEN_EXPIRED: * reclaim state on the server after a network partition. @@ -2689,7 +2684,7 @@ static int _nfs4_do_open(struct inode *dir, dprintk("nfs4_do_open: nfs4_get_state_owner failed!\n"); goto out_err; } - status = nfs4_recover_expired_lease(server); + status = nfs4_client_recover_expired_lease(server->nfs_client); if (status != 0) goto err_put_state_owner; if (d_really_is_positive(dentry))