Message ID | 20170117203205.29033-9-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 5141F6020A for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:35:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43633285BD for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:35:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 378D8285C0; Tue, 17 Jan 2017 20:35:52 +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 51D5A285C2 for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:35:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751272AbdAQUeC (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Tue, 17 Jan 2017 15:34:02 -0500 Received: from mx142.netapp.com ([216.240.21.19]:46740 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751186AbdAQUcw (ORCPT <rfc822;linux-nfs@vger.kernel.org>); Tue, 17 Jan 2017 15:32:52 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="165683716" Received: from hioexcmbx06-prd.hq.netapp.com ([10.122.105.39]) by mx142-out.netapp.com with ESMTP; 17 Jan 2017 12:27:07 -0800 Received: from VMWEXCCAS03-PRD.hq.netapp.com (10.122.105.19) by hioexcmbx06-prd.hq.netapp.com (10.122.105.39) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 17 Jan 2017 12:32:30 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS03-PRD.hq.netapp.com (10.122.105.19) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Tue, 17 Jan 2017 12:32:30 -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=ZX8YcvZh4TJa3GD4O/d3EegU3EKvnZaJ406qQPe29CA=; b=P/oVk8nK1iMmvvZ6QiT/nRNGXHN671+Pkuthxm7twhBX6r/5iuKDjz6Hac91GQ+9TAD5iSfdCQqI/EaCYS5MThKISIN7arTsFwTjeQRRME1YuyKyt3JMhnTbe77FlrxDQqoVIlc/X0rOKdgzwcALmCyi93wu44pW9Ww4GoKCAvA= 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:28 +0000 From: <Anna.Schumaker@Netapp.com> To: <linux-nfs@vger.kernel.org> Subject: [PATCH v2 08/10] NFS: No need to set and return status in nfs41_lock_expired() Date: Tue, 17 Jan 2017 15:32:03 -0500 Message-ID: <20170117203205.29033-9-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 Content-Type: text/plain 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: 7ca05c5f-f8c2-4b4d-099d-08d43f17f47a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:1OHsoKzIE6i1BaWukaenfC85bRAkwNidR+wwRP836/oACmXrjVIM0Yi2yB7eKdtkuRObMK47xaHl49HW8pDRa29V9qSr52F812Wrv3AtkTCYPGAPl6Ee9ZWi6e6iasZ2YxC4rGTDw/POpKFeVAUBeOIigTNTUHV5D6vu5dN0v25wv4xcoMeAYuFqhb9Pj8z/TDVQgJXaYKPpK+Iuzcytw7XZBpqxjo4aXY2wQHMTfjBs52lXFYtW4i0W/H0oZ+G9flIw0LES2fr8sNt2dBi9zw== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 25:IYJ+AgaARjMMnUHGD/BdfxTY2tjjCjCfa/tAwYe3fW88wtF/BruA+s7Ex0rT7uHZFlR9tqsQrbvz/o0k1CnxhAG3wmh/flUuwLJMlle8qGdQA2F8gOe77qldc1UkK/M8jYXq3sXjjkyaIDB0ZgbgJiopxSbHes8GOhqjN+GrUOx6+BPJj1Ghh0N5QboQxEET7BiXx1eMa/FcBQfzPRcVUiS3+WwDgxs+HO3h80WY1J0ym7HRgyH8/vQSXG/ek9ZOW3ABTiRrgIOwoYsWO3OY96rxEJPakfQtEJfSmlA80jtANXUmwIAQxn+OFs2ZlY8pl9QXITd8Rko1w5TbrSrEXVJ44SJMc8fm1AXVqEn22YME8Cu97V8zgK4jXorq5Uwh6XScRe3GXyk3hkqpiWOrj9vFyPQW5gmUPUgKN4vmHUURqr0opNPFx/cOhipiNQSWwGpv/psg8Hdjehq7oHftRWQlpR8X40Vi0VTiI20+a1aWdDxoF3BmkEUNrOZZWLCqUNBez5EHKFSGQ7LMZ5M7qLdSCFnVfj+eaHMfTfMtQb1Qql3hGiHZvb1fuYp5WF6hkY5f7cwXxsKquE77841U2pGiePhVFCurrRfdehuEtFbqqGDYSMGKFMYxqr0ChTpEB4Ppg6Nar4dBwIt57wjfHmrRK60XcgV8maDXGIdm7OJgMxeuP+wozLYKZ5SxNOukcQxFds7IrvpcfHDfKL2MOagKA4xYIAXYxN6ljo1HbkRjF9DRKA3ZW8OZE/ws2DSbjNpegYWAWD76doMxHHxc5g== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:5Oi3TfPXt3AET7lQS9r6SJwRit/tdtNjxYCVhJ+j/xcqciUsNIW4QbOm05n96fNyKgcEgGEYiue653MxP+88JATYmoi0sEIaA4MKD/7H/IOUtPzOY5+mqMrIqq8jJ4XNQV/TKlqf5g+Z59Yo/UhJu3kTlCNJC9XU9ZAM0lM07McBdAkoXvMLTp+lrxXYiM/tx+MkfmZE5/l6J8GddsBNfEx971B1v9Hu0tATl3Z0owJOH9i1/S3WAVlBFkhMtnn2SC6kmwiTtuD/L30z8egejQ==; 20:MplggSMHbvgWV3z2S6LdZdIqZGMV5ScvSq15IY5PtWreP56LsigXc81lc0y/y1cS8irQBKCoy19D3d40fB00PgoSXiE4hMVr11/lcMAVL+9a9kD/1Fiibdr031mJ4eJ3e3v4wpl03CfjOfrD3BG1ZTko3lgklMMesgAawz22Z2j7cRkkjvzB9GRdrNopwdGq6qoBx5Pl6S1H1Qc2o1MPWx9qVd1/41kwkddeLfdXCerNaJJhQdtbWZBusiW8wDrvT+vloTko2YgBt1jo1Mno9QCP01/2F8wdVuJ2u1TyQIO4ZuWGy47Smdx7QUUbAgKGAhA8YfvcI8vidZ0tghD9KJ4ip2+fieZWAOHN577UQYTsmiblVA06I1hqEOG5Yij8EGDvKn3dP0WOh6t95+BNKKXJQtwpAwSKIu5b7HlWwGZTc5dFPCpv4DfwFwdHPetTMippZ4xDYrZ/POz4FSoBBSDhB/R+m6Dq1WsU8X+FSm8mLCR3AP0c04KHL33Z1EeI X-Microsoft-Antispam-PRVS: <SN1PR0601MB164600FBF2A1D4E89DDB40BBF87C0@SN1PR0601MB1646.namprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; 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:nXOQhQSaUQQxq7a6H+J/g0a4RzYTWoee+Ts6pU9TS2WhDi1v9ay3um9XMKsdFCx2+GL6XGNutSMxtFlV7yI8UHqaH/5zEzbxwwd60NV/IS86sJjFkIaRTeZkj0JPEfBbAtY9orO96kPOMsNpn4CwLMJYy5rypTOon+HGUSRfCza9XH5p+CTd52wKCimrx5w2IDRkPUUVbj/8cReLPy/H/qrL59noZoxTMOiquCpEpY/RVNH3dKsjeBx73Q0XbUugm4vcfzXPHyV78Z9lfuYd9SE0InbuDis5B7Td5HKJ0FyqrBEa8CoUOUFoD9VDQuQ84q4COUBlQ6GxbTUPQzrVytRUFxdb+bmDDhzpIaPCKF542gwxi6ooZ9gesXe8qW2TDPgv0aegORjt/Y0r+/YVy9KDR7FdrbJBYf256wP1NW+PQQdg8bwfZ9OiWrpEdiQ9qkFNedW6Y6pV2KYHZQDqvJFP+BlGmiAgtBXWfHn6E6TlWqjEJc/Uw3ut3sC0FmtfMt/pawpulmZjfVUucY9wOK8emC8nL95BV8lRUMymYzQMod5eJSriupHILNXXuew45oYi2OJ+uc1zvxk6rPSbng== X-Forefront-PRVS: 01901B3451 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(189002)(199003)(50226002)(107886002)(81166006)(97736004)(8676002)(81156014)(6916009)(6666003)(305945005)(7736002)(575784001)(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); 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:aIJry8lAJZ1cMCn1YqP8wBwgJKFEUJnwwTYFGzW?= =?us-ascii?Q?P6eX3J7MTz8DyLLHkroFbT9iBPjNpVVa6XiPo3Lcxkoqtl2xtXJA/fXb76BN?= =?us-ascii?Q?GfPq29xiNgZ+jMtXoxFWoflizZyg+aDq4o7eUFiboL85OJNIkeuyCUm9/kM2?= =?us-ascii?Q?53zGaA2biziTxbbfPwLqNafyQN4kv/aCYboF+H4r13I8ak56UN896lHtfP/B?= =?us-ascii?Q?xxuLVPl4j3VvhNhOzzSGvnDltImA1v2Vzgh24MbB1afZQ7u66X0s2PsVhb7F?= =?us-ascii?Q?kHriWrz2aw5AV936mO4ZUeJz9nniipsDhFLcJCipweP8sd1hacznA7eFN7dn?= =?us-ascii?Q?ueFGA2W27f+kuGMm0YRpXMIeRvtryj7yEGnZXBnqJPq07O6m9xX+eMYmOH0P?= =?us-ascii?Q?FOlAEK7PggrQ+4MXHO9epjePL7O1YkaVa+HPhAY+XKI5DIinnDNYKKLLoSxZ?= =?us-ascii?Q?34pkkRxvtxfFPlFMcI2fYNjFFiepIzYPsF/LSokMHxH78PEudNOP7C5PbBSr?= =?us-ascii?Q?gkpPAX3EZ+BVXejdZL54JUsVnXlO70YDSL0BwLE4Rt1gTvO+VxFFpyrn/uRF?= =?us-ascii?Q?G1Pz4NuCiFRTYZJ1lj0klthuhQbikBJB6IobFIJbbcD+uBXKglqyFjlgQHUi?= =?us-ascii?Q?a8Bycpb9n7n4u2TThVCYtSWGQITOMwFD3jlgei9Fhj0E7QfzJU37pT3gbZwn?= =?us-ascii?Q?RWX5if34l8tu7xDmAePO9USufbRuDyz5LIm/AHA82YFV46ofFiMoRzU6KCbd?= =?us-ascii?Q?FGWs/zKa9Dcuj0MzoEWiwPGwPCxA3HVWcOL1kMW8y7jctz8iLWsQsETxnuMt?= =?us-ascii?Q?FIJPuyrlem/U6isOkRSY+ZbS7m0P75EAGsIkyeCI6um6EZWKsdhmNu/p//kf?= =?us-ascii?Q?vYwUAJuClOPiAGmBC3g5niKD61VD4uaZNTkbE65BQnUYodUNT95I4h5Q8bzc?= =?us-ascii?Q?TKHJBI+cZjLtkKPsLzzOyXxEMJyH1tgY8lRCRL+Mv852fCYkE5w2Zqbb9sag?= =?us-ascii?Q?AXNfKCPY64XFIRtfVfxErtBU7obh5myKbmLCsLjWmhVQvXsz5sE+GfPpHund?= =?us-ascii?Q?0lN9vKG+rurVmXcFH6s1Q10oWGTxg7UJIiow9jC4K82ffxZrce72TKOPfHcj?= =?us-ascii?Q?WV+FfdxHXL6yJw84ETtnUQgZMjX6nzyDPY7COlWeSU/lx9BMfndgwE4UMI0j?= =?us-ascii?Q?3IaizcbeFUXl9N0LsOEmqhKE6lWNQ8Qxe5Y52EsWPD4W3wx5NQEg8hvd2RA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:2dzoBIjX1a3HdxbMaachuP9hndLKRNf1cmwkEy6ksmayHDxOIa+AAufTZNheV1mzzAywxT+eAWc1tFwcSQm4ytK9EcJZP6ydXKjUpFjVF7scMN2ipze56wjVg7iQjiMmyN4cUxX50RLnd8hq+MOEkC1NXVrOYpJ/8XmMwJOAMRsCyzcfA+AJdlU8jFA/DoWba0/SNx3fyRHn39xcrLG+vPQ/U6J9ry92ridyC7/7G+eMvbfxEcErF+hZ+LymcrpzZwA3cZgw1K32I6SVHwrZ8TTt2dCppmsa3mET88OCLwWtJA5kpWHBbgooUipemmsq0iWHn8BNCG0us0eNYVYQOCpCWzhoU7+rAegdsf+EnOA9Op7iPjJE3Syvw69ZQYQIMnQRfqlaCpKPqKDjxVaBrpCASBDYK3MTs5+XBLZf2nw=; 5:d7MFINhcNt52VLTO9PZCX5Y77+T1sMgp3PpjpEpAs9VBG1bQWKWpvGwpbVjVu2tTyy1COAEyg59w22RtY3Zo70vs/z2LPs9d6Im/EWO3n0K2GL3ra5OPALWD+WCraPX5oh1xXpGoHbu1HAeQwmV5hg==; 24:GwmfWCsCUFrgrxZMQgijCguqzOyTrjB0Adpzj31q9ZvsbelBFDqHTbLw2uR7cqmMgdLeRpS9A0U8WD1VfYqBAY9LJtklvWVMbtF3Pc4YW8M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:QAwGVAkWTzgrW657kD2BHGf0lWEZePSZO7jH0VB9OyX9uql1MJmPAOgL9hBwRUTEUH79pXhPyH9XMNh3WhDyPkW5GSkiWWofjx1nefU6hQfMURNX5bQMGidkASwJy8IFsDHRke94efApvmENfbDll4tM/baYYPzRrRw5ajHQ/q4Ka7qzON7+pFnkbTwwp+J6guhcSRXADCx7/BKl1IlnToTnwq4YrnleMKrmVepL86zvm0xdRV2omp0mXovxQAc4NE/d4CAIyArhTem/akiteofEVwYM0MkZ6HwVaxBFSWXOrdW9zR+ckOuzFiYhHw26zwGeRLOPjr/nR6SflyUg3pru71qGT2WtX0NcIpuzIo3d/KGyl+ZqP9Eu6f/MOo+PFMoUeLqmNcCdVrCx3Anvu62sNtyiAdhRUGsrkfkxP4lRQsmL9IGlp64UFRuLC+8Wr5ytcZYpCc0XcTOHwLzjfA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:28.1095 (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: <linux-nfs.vger.kernel.org> X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 67aa9cf5f569..c6d0a93ca652 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6274,8 +6274,7 @@ static int nfs41_lock_expired(struct nfs4_state *state, struct file_lock *reques if (test_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags) || test_bit(NFS_LOCK_LOST, &lsp->ls_flags)) return 0; - status = nfs4_lock_expired(state, request); - return status; + return nfs4_lock_expired(state, request); } #endif