[GIT PULL] please pull file-locking related changes for v3.20 (pile #2)

[GIT PULL] please pull file-locking related changes for v3.20 (pile #2)

[Jeff Layton]

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

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:

  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 <jlayton@poochiereds.net>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [GIT PULL] please pull file-locking related changes for v3.20 (pile #2)

[J. Bruce Fields]

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 <jlayton@poochiereds.net>

Re: [GIT PULL] please pull file-locking related changes for v3.20 (pile #2)

[Linus Torvalds]

On Wed, Feb 18, 2015 at 8:05 AM, J. Bruce Fields <bfields@fieldses.org> wrote:
>
> And I re-ran my usual tests on that (which includes some locking tests,
> but not LTP).--b.

I assume this was an implicit ".. and they passed".

                      Linus

Re: [GIT PULL] please pull file-locking related changes for v3.20 (pile #2)

[J. Bruce Fields]

On Wed, Feb 18, 2015 at 08:14:46AM -0800, Linus Torvalds wrote:
> On Wed, Feb 18, 2015 at 8:05 AM, J. Bruce Fields <bfields@fieldses.org> wrote:
> >
> > And I re-ran my usual tests on that (which includes some locking tests,
> > but not LTP).--b.
> 
> I assume this was an implicit ".. and they passed".

Sorry, yes!

--b.

Re: [GIT PULL] please pull file-locking related changes for v3.20 (pile #2)

[Jeff Layton]

On Wed, 18 Feb 2015 08:14:46 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Wed, Feb 18, 2015 at 8:05 AM, J. Bruce Fields <bfields@fieldses.org> wrote:
> >
> > And I re-ran my usual tests on that (which includes some locking tests,
> > but not LTP).--b.
> 
> I assume this was an implicit ".. and they passed".
> 
>                       Linus

I also ran the LTP suite on it last night and all of the fcntl and
flock tests that passed v3.19 also passed with this set (thanks Al for
pointing those out!)

-- 
Jeff Layton <jlayton@poochiereds.net>