From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756260AbbBQMqh (ORCPT ); Tue, 17 Feb 2015 07:46:37 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.226]:13181 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756228AbbBQMqf (ORCPT ); Tue, 17 Feb 2015 07:46:35 -0500 From: Jeff Layton To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Linus Torvalds , "Kirill A. Shutemov" , "J. Bruce Fields" , Christoph Hellwig , Dave Chinner , Sasha Levin Subject: [PATCH 4/4] locks: only remove leases associated with the file being closed Date: Tue, 17 Feb 2015 07:46:30 -0500 Message-Id: <1424177190-14252-5-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1424177190-14252-1-git-send-email-jeff.layton@primarydata.com> References: <1424177190-14252-1-git-send-email-jeff.layton@primarydata.com> X-RR-Connecting-IP: 107.14.168.118:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We don't want to remove all leases just because one filp was closed. Signed-off-by: Jeff Layton --- fs/locks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/locks.c b/fs/locks.c index 59eadd416b8c..c748176fde6a 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2437,7 +2437,8 @@ locks_remove_lease(struct file *filp) spin_lock(&ctx->flc_lock); list_for_each_entry_safe(fl, tmp, &ctx->flc_lease, fl_list) - lease_modify(fl, F_UNLCK, &dispose); + if (filp == fl->fl_file) + lease_modify(fl, F_UNLCK, &dispose); spin_unlock(&ctx->flc_lock); locks_dispose_list(&dispose); } -- 2.1.0