Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752616AbbBRQAz (ORCPT ); Wed, 18 Feb 2015 11:00:55 -0500 Received: from mail-yk0-f178.google.com ([209.85.160.178]:41306 "EHLO mail-yk0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752579AbbBRQAx (ORCPT ); Wed, 18 Feb 2015 11:00:53 -0500 Date: Wed, 18 Feb 2015 11:00:47 -0500 From: Jeff Layton To: Linus Torvalds Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "J. Bruce Fields" Subject: [GIT PULL] please pull file-locking related changes for v3.20 (pile #2) Message-ID: <20150218110047.1fe8bcba@tlielax.poochiereds.net> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_//duiCxTfpHy7zYQl_It=7TF"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2669 Lines: 71 --Sig_//duiCxTfpHy7zYQl_It=7TF Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Linus, The following changes since commit 1fa185ebcbcefdc5229c783450c9f0439a69f0c1: Merge tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/gi= t/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(-) --=20 Jeff Layton --Sig_//duiCxTfpHy7zYQl_It=7TF Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU5LcvAAoJEAAOaEEZVoIVAYAP+gOVP/XSr+y6RHGzjMHvXFbZ fTsFYfaaCGDnf2gvr531IqR+uie5I1XwQNsA/LW0Qn0uhjYpf8AsYjTAi8xuC8Ny M1D6ORNDoGUd5Fe4ryFmMIClX/tIBpttv2bkZXX9yzRe9gUsIGKwhgk7qJYl7mci 32yybliePnRRCujGqhnHNEOf6ayo+n00kRDAe5vTcTU2d5CnJkUKpSslAvjvsdwW JNNiAK7k1tHmKzHphVguWXFiqLdJgTM8qVeYWUrTvw3UQCukFwb4M1VfNPCrpqb9 WanQ06AEglLFw9+e8CDCY6rDtfQmXF0LQn3rqKkmPXhXgnJ+xQrr2+Y+CEYGRuFW j9saW+pbGcQUb+/ojx2zz1AfyTuyBIuZcbapg+AhB6NvFyZlvK/RmMNbBmZZC+2L erjrkiR+32t/55mA5V5MY95PgvAIYRIFcorD6RvV369BUT4DbItRh9b7cq1i/Iue 4JP5NNAJBAn3Unuy3MNvYXFfvjfCHYYS2BaVcHpvv4+D6ZWPcRnPq+uVaBTwBcDU sL4Oc32K1bzUuRvRd5mdY39khX4MhBfEtY+Tnk9+btIsbgffzlgjzpn3s7J4bCqZ 8Tr8asl9G2qi1NY0dht+rngM3mWBzOhvcAq2wcRnbzb5XYUtDyLXJWOdDSPIi0mK pyNXh8gjbDRnQtedhAGv =8NW8 -----END PGP SIGNATURE----- --Sig_//duiCxTfpHy7zYQl_It=7TF-- -- 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/