Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752514AbbBRQF6 (ORCPT ); Wed, 18 Feb 2015 11:05:58 -0500 Received: from fieldses.org ([173.255.197.46]:47924 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752210AbbBRQF5 (ORCPT ); Wed, 18 Feb 2015 11:05:57 -0500 Date: Wed, 18 Feb 2015 11:05:55 -0500 From: "J. Bruce Fields" To: Jeff Layton Cc: Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] please pull file-locking related changes for v3.20 (pile #2) Message-ID: <20150218160555.GG4148@fieldses.org> References: <20150218110047.1fe8bcba@tlielax.poochiereds.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150218110047.1fe8bcba@tlielax.poochiereds.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1794 Lines: 47 On Wed, Feb 18, 2015 at 11:00:47AM -0500, Jeff Layton wrote: > Hi Linus, > > The following changes since commit 1fa185ebcbcefdc5229c783450c9f0439a69f0c1: > > Merge tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris (2015-02-15 18:02:02 -0800) > > are available in the git repository at: > > git://git.samba.org/jlayton/linux.git tags/locks-v3.20-2 > > for you to fetch changes up to 2e2f756f81edd7c3ba6ed384385ae1d6491652eb: And I re-ran my usual tests on that (which includes some locking tests, but not LTP).--b. > > locks: fix list insertion when lock is split in two (2015-02-17 17:08:23 -0500) > > ---------------------------------------------------------------- > File locking related fixes for v3.20 (pile #2) > > A small set of patches to fix problems with the recent file locking > changes that we discussed earlier this week. > > ---------------------------------------------------------------- > Jeff Layton (4): > Revert "locks: keep a count of locks on the flctx lists" > locks: only remove leases associated with the file being closed > locks: remove conditional lock release in middle of flock_lock_file > locks: fix list insertion when lock is split in two > > fs/ceph/locks.c | 9 +++++++-- > fs/cifs/file.c | 14 ++++++++++---- > fs/locks.c | 59 +++++++++++++++++++---------------------------------------- > include/linux/fs.h | 3 --- > 4 files changed, 36 insertions(+), 49 deletions(-) > > -- > Jeff Layton -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/