Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752693AbbGNRFh (ORCPT ); Tue, 14 Jul 2015 13:05:37 -0400 Received: from mail-ig0-f175.google.com ([209.85.213.175]:36761 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751627AbbGNRFf (ORCPT ); Tue, 14 Jul 2015 13:05:35 -0400 MIME-Version: 1.0 In-Reply-To: <20150713133858.GA1130@fieldses.org> References: <20150713064532.04060cba@tlielax.poochiereds.net> <20150713133858.GA1130@fieldses.org> Date: Tue, 14 Jul 2015 10:05:34 -0700 X-Google-Sender-Auth: qLS2shdEJ4HYRPZ3hz28p7B348g Message-ID: Subject: Re: [GIT PULL] please pull file-locking related changes for v4.2 From: Dan Williams To: "J. Bruce Fields" Cc: Jeff Layton , Linus Torvalds , linux-fsdevel , Linux Kernel Mailing List , trond.myklebust@primarydata.com, Anna.Schumaker@netapp.com Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1780 Lines: 38 On Mon, Jul 13, 2015 at 6:38 AM, J. Bruce Fields wrote: > On Mon, Jul 13, 2015 at 06:45:32AM -0400, Jeff Layton wrote: >> The following changes since commit b9243b5a5d2da4eb0a54950f4e2d6272863b48be: >> >> Merge branch 'parisc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (2015-07-10 16:54:37 -0700) >> >> are available in the git repository at: >> >> git://git.samba.org/jlayton/linux.git tags/locks-v4.2-1 >> >> for you to fetch changes up to ee296d7c5709440f8abd36b5b65c6b3e388538d9: >> >> locks: inline posix_lock_file_wait and flock_lock_file_wait (2015-07-13 06:29:11 -0400) >> >> ---------------------------------------------------------------- >> File locking related changes for v4.2 (pile #1) >> >> I had thought that I was going to get away without a pull request this >> cycle. There was a NFSv4 file locking problem that cropped up that I >> tried to fix in the NFSv4 code alone, but that fix has turned out to be >> problematic. These patches fix this in the correct way. >> >> Note that this touches some NFSv4 code as well. Ordinarily I'd wait for >> Trond to ACK this, but he's on holiday right now and the bug is rather >> nasty. So I suggest we merge this and if he raises issues with it we >> can sort it out when he gets back. > > Sounds reasonable to me. > > (And without this my regular NFS testing crashes the client every time.) +1 to this series fixing a 100% reproducible slab corruption + general protection fault in my nfs-root test environment. -- 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/