From patchwork Tue Dec 6 20:50:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9463267 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 0E8E560231 for ; Tue, 6 Dec 2016 20:50:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2C7A284DC for ; Tue, 6 Dec 2016 20:50:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E507C284DE; Tue, 6 Dec 2016 20:50:41 +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 091C6284DC for ; Tue, 6 Dec 2016 20:50:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752242AbcLFUui (ORCPT ); Tue, 6 Dec 2016 15:50:38 -0500 Received: from mx144.netapp.com ([216.240.21.25]:45292 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751985AbcLFUuh (ORCPT ); Tue, 6 Dec 2016 15:50:37 -0500 X-IronPort-AV: E=Sophos;i="5.33,310,1477983600"; d="scan'208";a="162876238" Received: from vmwexchts01-prd.hq.netapp.com ([10.122.105.12]) by mx144-out.netapp.com with ESMTP; 06 Dec 2016 12:48:19 -0800 Received: from VMWEXCCAS02-PRD.hq.netapp.com (10.122.105.18) by VMWEXCHTS01-PRD.hq.netapp.com (10.122.105.12) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 6 Dec 2016 12:50:30 -0800 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS02-PRD.hq.netapp.com (10.122.105.18) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Tue, 6 Dec 2016 12:50: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=5mgeoPf82lg6WL6HzFDX7/zrBlUeQjKPSb5PIQp0i7A=; b=UmtLZwdNYtsDAiBNm+8hGb+e0cHO+9gDWzRLqytjQO9JPkR8qdBTTSXiK8wH6SRL15G5GJi/+a3gw0IXtJOG9FekYGfx3ZsoV7ultUEzxwYdypcRdBLMd4Pp53Rfs6QHEw3KP9mPEdBpkjX2wxYntDTRfmHQrz3ePnxdX9m44rk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anna.Schumaker@netapp.com; Received: from gouda.net (2603:3015:3601:f500::56be) 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.761.9; Tue, 6 Dec 2016 20:50:24 +0000 From: To: , CC: , Subject: [PATCH] NFSv4: Add missing nfs_put_lock_context() Date: Tue, 6 Dec 2016 15:50:06 -0500 Message-ID: <20161206205006.3467-1-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.10.2 MIME-Version: 1.0 X-Originating-IP: [2603:3015:3601:f500::56be] X-ClientProxiedBy: MWHPR07CA0040.namprd07.prod.outlook.com (10.169.230.26) To SN1PR0601MB1646.namprd06.prod.outlook.com (10.163.203.140) X-MS-Office365-Filtering-Correlation-Id: a97e9baa-c1ad-48a3-fafa-08d41e1980a5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:hYZmOQoSCOYhvOGYiUzSsJzK25jTu48iXwbTO0eEePm1qqqtRUwYJgsSumvJNPJIMcrYhObHr14mrs+qN2RhGqSPfGMMkfsgi1x/VShZeaRbkHsFIIx2cS+QfJ4rJJRTtIwdq3Vfxdp54kvFCcjy+ESmAsIpYjjqpLbOTjHOMlOA1FdG4QLPtWsNLu6bS9eCFEgby5mWrlEiU6Fc8JsDqR9npxP+iU2qdKH6aeLLodZ/IaJyNQm1aSVo5LnTqJeud6Amoz7ERqI9uoTm8Eabrw== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 25:xISjF5tMwxNVYoZOiXRspt5T/3drD1mPnBTutPvH/js0pEpkGpBsuYb4edygS4l4aKRpCdqU3xrdocCjsUPY5zk5GkOZrPvKx1FyeacXN8GogiBF0iCel6F1/kZlooxwzkgSDnbLz30GuN/zIkM5ELrakBj+GRI+epTY15AiCSb4Fkzxzib4IilBH509rw3vN0zOHCUUTN3ExkcXVM+aEypYFNhOC12hGzxN/oe3nwFjokhuF2S3N4wsAKKTRCAhFvJJTWym/vUCjMQjH7x0L3aX4+qRN9fwvVKMSV49Wc/VVguMMDsHwM+PiNci1t9JscDwiaJkVKhp5aQ8sspCnTXBRUGGcPRZdKoO5QJV6KkcMaqjmcVzMTI+TvvKPag2yMpkmjMXiy5022acEKTSxhM2fiJTDlf52w1MmEY2D0a8d1w6mGeAqJzwjqir0m1jyB0joEEZSVmCHIVNnO2W8UoRDjgfK7x8T5uHuvt4PKXDxXEtKcxlSt8jH2JuNleC9kSNykFkB2Qwrp/9v7VxAdVkRJKfb/PIIEE8ShuVoxE2zKIHVdy1h5FogzFNkRFaMiaNZseg4sBebJfd2cOGqos0vxMXPDs7Bb5id90X4h2OW+x6fyO4XMDO/o7z2qpwLJarjc6C1o5GHnUpYP5FFgm4ywshClzzvpHYnKIOE36Hh5nBN26291zQ/opTKVzsPPbnZw+3VlQb0JxP1ouuon3uKZoKLtTaAP37NMDVNryWoRROwn0ftAI+Q8uPieNtMV7JNUpAh0z4E3oDb1j1Pw== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:1zVFhb8Dp4yKF3TICHfT3JrgYP62lsXBa2OW9Oc33TjrO3ae5Dnd69svMIoJVhmSXR+84QMXTAxERvhNUvE2Eeh49cQ7xAY63mh5ieDJnN9n1vTiaNZIdOAKKKIzmAL62vhdO21KuymkBTCDy3y1sy9j8mEZAIb9Mt2y8aTJsskH5nY3gCfvgyRhy6rFZHV5YSv6tCUVZOWgaAiflZ39RrAeA/smRn73xLuxdXS2xi8k9MwxR7gkZdwUUzm7gsmqbbLA7CU5wZLxdItPp/yFqQ==; 20:NNMIHgBhZggFYcjSSxvG0n2sT7ExoBpzqXpa4SIXMH9RN9H8SZe7z9G6P84fW2BXah2riTgiwGO5o5OVe82kpPhLgYZ2P+DZHg+CLbOAaCN8jCRPJsiVx7G719U+Z3wl43V1yLhpbtVEspTfEf1OkV5T+/Iyi1+5IATTYZ7vZjtOXtxP3MIBR1apX4DOsNyTT2raPowf44zHvt1JPk0ux0f4jHwiHokY9BObZRccbK+3MTIltHhzknx2//e6VrWl3vTFXzzcXCUeGQ6gY1/LS6jyAo2iFd56ZJ6FH2DZf9e3kk9vrvYvZryvlkg5oue6CbSF42fcN1xKVD1qIfRZ7C/UcOWa3oasqclrqniGgu3u00r/RPwhOCzihNIhMre4q1FVEuY62tCvnVJ28ugNn3WCad5OFYMH/rZJzsDpHjgqJGlrF98jPknMidiC4xrGA1L3tkOJ9tBDVKny3cevq931jeCH7f6/SxJEAUZ+lF/KmH6phpEwA/cma2qiVjT3 X-Microsoft-Antispam-PRVS: 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)(20161123555025)(20161123564025)(20161123560025)(20161123562025)(6072148); SRVR:SN1PR0601MB1646; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 4:K9874zd54vVwzQ4BSDdFOfyQTnWszVOYBInPJGoZ3qTdYipTEToZpGj9nqHqXGLIxEF0Z6s5OB0NwBwTMDSE1uSZ91jJHuoulrvf9yhJ8FcfgTH/F2usaAN7/Ifkc4blppBwjYy1Qa8TFI0cdepOY5Sqm5gyAP9kF8ChthhViw8gJ2cr9Z+gwUWIC7TXMjUtVYySrTXI/NfG+2ubOjtKS+kAsv2IRZYW+LfQwiikS2Jkm6bYDPNvPB2rO0REvDUE78xDu63o+P6YoMkWAlAeT5hsJXuk2J7VsHULdeQ2OgeZ9iX+kRQJBPxzvJVi9oSO0sZwD6oQPdBF91Se1RzJL6fiSl8BSxmMqIfMfZdFAQpTjfODB8rVFrHQ/VrMGA/T4/EgOQO0XwyTIxj0GEvugtXqWtxL4yOZNyURDT17qZFiTv6Ch2loI34g5O32qD7MT+dGWXumKPAJZ0pcvwRexN+DV7HGCDYd2JwHY1kDzqxwZR13SbVK8HBn8EMvU9mOGY8mSBBHUZ2hkzKK4Ey/Iy0/q7h4ZcJb1ugN3qc+5ZpqmVUffVQhI87wG9jU45kzIia3ucLPIc7RY0t9d0rAtw== X-Forefront-PRVS: 01480965DA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(4326007)(50226002)(97736004)(86362001)(6506006)(105586002)(39450400002)(42186005)(733004)(7846002)(5001770100001)(36756003)(7736002)(5660300001)(6486002)(86152002)(5003940100001)(305945005)(106356001)(68736007)(189998001)(6512006)(38730400001)(2876002)(8676002)(50466002)(47776003)(6666003)(48376002)(2906002)(1076002)(50986999)(21086003)(81156014)(101416001)(69596002)(81166006)(92566002)(6116002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0601MB1646; H:gouda.net; 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:ksuCJfzlY/LcnIxc+YK3r8h2BM+kPxDAAn7TyFZ?= =?us-ascii?Q?0ngTb9bnagSRdSKFHfkvnvhQ3014vCSKvEY5OoMgCZ7PF+YKy08XAfLiR6Vi?= =?us-ascii?Q?iEoRc9fzwBEs2q8xU3Rt9VZ8rYhr3k37mp1PkAp3l/SX2RKlv1xVCzROkZh4?= =?us-ascii?Q?AG8c7sd394Mx9RT9HwKjcKkbgKY2yBYNCYVajy8LFiwLBxsE90BJY3OGgFX9?= =?us-ascii?Q?djqGbUjBe2jtYDQEJNdPKXvWPSvTduU5uGwbJ7ThWySR7BOp2QkO64AS3tdY?= =?us-ascii?Q?B+zLv7xBikqbt3AC0RZNfLl1mctwGS3vud8WbtE4vJUSUndPl+SomUGXPWKp?= =?us-ascii?Q?tystGh+D04aflxembjq4tL1DsvYyy/4WbYC1F/Nwd3H/7ExptxlPGTnEMzDo?= =?us-ascii?Q?pjTzeu6DC32eXCiwnRYTLEh7ourrQfP52D5ujhgZ2EZMIGClytEG0og6TKFC?= =?us-ascii?Q?PfM5F4BU6yHqUwnl4MUk1Dvd3EmNXKvz7trOtZOmdrzJ4q5t2t3gCIXePzAE?= =?us-ascii?Q?KCZnyktu30eTtsdnTvcxPTt1pq+njMamW6KTo/V8UrJAcT/HJ3T+lkUxlUCC?= =?us-ascii?Q?VfUiIT99l6NnDUgJ5CODQK+V/ZXg4rDUnF7exOiAJZXgr9MiFmH9D8zc53WM?= =?us-ascii?Q?2596FJVYY08nPaFGlNszr8FRh+o7O+KhqRZZlfVSZ/ebJvKHw9HZ2SnHu7ov?= =?us-ascii?Q?9MG7AD9eqNKr3cXntiZD6qscsTYqE0m3i6omxvQw6yLkt7tAZeNnDjvSmFDC?= =?us-ascii?Q?CPdgTNhnfuB4kQ+c/lBXNBPqSdoegdkHqhRUGnaVNZG7tk8AueYZcEkM3WHW?= =?us-ascii?Q?ZCgvu3ZVUkN6CrV4jFqRvHTz9KNQBNr4kYSkelVZYh2AJs2gAiIjkiSkWRcZ?= =?us-ascii?Q?wwCtpi9lZ1zwlvLGjwGvaL/SXm0SMSzq+DxuqmBvKDazvjxSsePk3hV2Z/0l?= =?us-ascii?Q?wkOE2PpXXRQhlfIFGm6B5n4qOwXBvuPajKBOodQeEK8Cctk6eN1I+PCU5ry7?= =?us-ascii?Q?1LLdzTkXcnoTK+jBtUQVwH9I5s22urU7oNO5hQlr0mbUaDfsfYSMZjTFsK4p?= =?us-ascii?Q?p6akEqojdxoAohqZOS4OKqUrAySyd?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:2JQkt5e6r2HDBVX2R5W3BCfMJpp2SXHmWWpTXB17eT5/P436rONCOYaX/XK0blDbQOJjjf6p5IFwthBzGjwvf4aHIiSvePWdzRqouPoM8t5xB56u9CBldp/h/eJWlZvvUFIT4GItYaqsn9ZoYUtyhLGsV/UyWsUAnFrT8O2s6aJu8a04qZuiAD8amNBKuV0fmuA5T1/XUpSJuzZIyUUWJZqJTlFLrlqK+JPUZm+7PMltNwVdMFq4EbwQWNejfYiRu5Sh06j1rnF6txJs2tF+W1x9Ea/ThT3rz9oIYDUFAuDpK79kZxh26ERSh2zq+KCy247hVl4EmSVjIQmAMXBXXUKTDg0UAAHiZFZJ/NOvjhUuZkuzJGLRZY08Vl5wVCoXWh8WyYICukOTPhOJDeG4G9dSWMwE7lrzQ6b7MxUJl9w=; 5:A6xNUMUMhS5f5VJpMBoIHjgdK2Ecqp96aEmoQF95h87R7kfVT5forn2F7umWG2FbdP7/hIlNhLRriXpm0Nre8OzIwSGxJzvRmL/qYt0GopBbFd9YT4yz6lNk6XytPh0xe0fVd1D6ycSmfbkpGlwqsQ==; 24:9Qi1U0qzO9Q8KX4+UZfIXvRljeDq0fMk1rLQ3cgxi/3+ecnpzrZEnRX3BBd/ci8USv++an66EjPcz4/a0m3wP3zeGnueYcFGqfdgWvFlqr8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:zJ892cGwTRpt6BGtHqLK3ur+qNPOcXNq6nOLr/tqr/t/T1VBHzrByKnjU6yoSqqsv1ydi5/D8wM0tJoyjJbC8tMLHXbBxJKaFdthynRr5cFugbpf8TFiYg0ikds8m8LjNHx47E5pRmNAzlt/UDHIwLmYNaNkWrNQqWgJRciFPBm8AXv6jLsOOH+MaZfcUifwkPdQVfaZOcF3G8b72pf3PM30fuL56+wyk7Fu0PJHe9i6rhyhgFNA2Z8xDlUgNTcFMZs2u2M2/oPweidi/5tojcOD4qpewdc9tvSnuOfTMnGdKa9Ifw6CVk4ZTs5PMkOpkl8crtKKuGSDBPyXx2ClPZQ4YQVCRN5n38BcTHS+7mYolSqdVQaOzMw4nIJNab7/qEwLaKRowOQbaPvi6bVfmrJZmc/RsGDUV3l8vtzUCSHtnOZbPrL6teOL21ZACbLg2Iblc6QYL0aLUws+DZ+JJw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2016 20:50:24.0393 (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: NeilBrown Otherwise the lock context won't be freed when we're done with it. From: NeilBrown Fixes: 5bd3f817 ("NFSv4: change nfs4_select_rw_stateid to take a lock_context inplace of lock_owner") Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index f992281..21c861a 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2951,8 +2951,10 @@ static int _nfs4_do_setattr(struct inode *inode, l_ctx = nfs_get_lock_context(ctx); if (IS_ERR(l_ctx)) return PTR_ERR(l_ctx); - if (nfs4_select_rw_stateid(ctx->state, FMODE_WRITE, l_ctx, - &arg->stateid, &delegation_cred) == -EIO) + status = nfs4_select_rw_stateid(ctx->state, FMODE_WRITE, l_ctx, + &arg->stateid, &delegation_cred); + nfs_put_lock_context(l_ctx); + if (status == -EIO) return -EBADF; } else nfs4_stateid_copy(&arg->stateid, &zero_stateid);