Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751501AbbGMKpq (ORCPT ); Mon, 13 Jul 2015 06:45:46 -0400 Received: from mail-yk0-f180.google.com ([209.85.160.180]:33846 "EHLO mail-yk0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751115AbbGMKpp (ORCPT ); Mon, 13 Jul 2015 06:45:45 -0400 Date: Mon, 13 Jul 2015 06:45:32 -0400 From: Jeff Layton To: Linus Torvalds Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "J. Bruce Fields" , trond.myklebust@primarydata.com, Anna.Schumaker@netapp.com Subject: [GIT PULL] please pull file-locking related changes for v4.2 Message-ID: <20150713064532.04060cba@tlielax.poochiereds.net> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/pbEc2mCVi2uotzHCmxL=JK8"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3143 Lines: 77 --Sig_/pbEc2mCVi2uotzHCmxL=JK8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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 0= 6: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. ---------------------------------------------------------------- Jeff Layton (5): Revert "nfs: take extra reference to fl->fl_file when running a LOCKU= operation" locks: have flock_lock_file take an inode pointer instead of a filp locks: new helpers - flock_lock_inode_wait and posix_lock_inode_wait nfs4: have do_vfs_lock take an inode pointer locks: inline posix_lock_file_wait and flock_lock_file_wait fs/locks.c | 38 ++++++++++++++++++-------------------- fs/nfs/nfs4proc.c | 18 ++++++++---------- include/linux/fs.h | 30 ++++++++++++++++++++---------- 3 files changed, 46 insertions(+), 40 deletions(-) --=20 Jeff Layton --Sig_/pbEc2mCVi2uotzHCmxL=JK8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVo5bNAAoJEAAOaEEZVoIV6toQALJleeBakGZoYl7a7Aje4wfi C2/1KcDkSHZDp7DsafbEsATJxCK109Rf3yHsH7GQpAW28oSDPNwXYVebXptXZWza /4vq5Pry/zaQ2Xa4fFfClcigionoCLa58niMtOrgrcDSTZw0wInig8BpEyitH8D3 xoqqvlSkXoRMjxKck3UN+GPIkPKntughQGdXYqs3sYizIyUfXsYlNNQKO3l4fB3O f2qWyRGEdy11CDNIDPCo1C0eFt+U0D06pu5t17guEyS/SrbKPQkbe7HPliLXHuAD X6VtK+Aso4sho8Kg6PR0K+XR3Pmm5KZpFQhse6ObpLif5odG4edA2dQl+Q5o46PI PgSJAChkEQ2k8JQuFer816dVqDbq1MpnCgbnUPYX1TtAv8iKqU4Fb5919qYI7Kxn SO+GjCZQ5zzJkRiAR6My7FaCRUYDjdbP4ChmHZGLCSSeaFyay6xCcFg8STQv4O2B nI8OvcedFnCjv18KFUo02rNG7eRLBxbC07QaYhzpT/eYgDWpBqiTev4cU36OnTFx tDejzFPWjs65VMcxHkST7KVOaIymjsSwb31k/bFmyNtFyGAvgw2RwQlVjfDqRoKC P71OUkZEcrPJJs9HmUfTM0RxGsW8DBC+xgOjQxD8ITb4IIvO5xD8Vh3IlJS0l8Kv kLD1JthfykmKhn2oEEwx =ywY9 -----END PGP SIGNATURE----- --Sig_/pbEc2mCVi2uotzHCmxL=JK8-- -- 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/