Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751983AbbKBCFr (ORCPT ); Sun, 1 Nov 2015 21:05:47 -0500 Received: from mail-yk0-f180.google.com ([209.85.160.180]:36480 "EHLO mail-yk0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751464AbbKBCFo (ORCPT ); Sun, 1 Nov 2015 21:05:44 -0500 Date: Sun, 1 Nov 2015 21:05:33 -0500 From: Jeff Layton To: Linus Torvalds Cc: linux-fsdevel , Linux Kernel Mailing List , "J. Bruce Fields" , Benjamin Coddington , Dmitry Vyukov Subject: Re: [GIT PULL] please pull file-locking related changes for v4.3 Message-ID: <20151101210533.268feaf1@synchrony.poochiereds.net> In-Reply-To: References: <20151101202101.1d21f82f@synchrony.poochiereds.net> <20151101204130.38102023@synchrony.poochiereds.net> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/LqKB6G.zFwjdEhuZXeWWl.z"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4190 Lines: 106 --Sig_/LqKB6G.zFwjdEhuZXeWWl.z Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sun, 1 Nov 2015 17:45:54 -0800 Linus Torvalds wrote: > On Sun, Nov 1, 2015 at 5:41 PM, Jeff Layton wro= te: > > > > Yes, indeed -- facepalm. > > > > Would you like me to push a new tag and send a new pull req? >=20 > It's fine as-is, I just wanted to verify the (fairly obvious) issue, > that this wasn't something you had actually expected to make 4.3. >=20 > I won't pull it until tomorrow anyway (I want to leave 4.3 alone for a > day to let people at least get a *chance* of testing it before I start > acting on the merge window), so if you want to update your tag names > etc you have time, but it doesn't really matter. >=20 > Linus Ok, thanks. I went ahead and fixed the tag. Here's a revised pull req: The following changes since commit 1f93e4a96c9109378204c147b3eec0d0e8100fde: Linux 4.3-rc2 (2015-09-20 14:32:34 -0700) are available in the git repository at: git://git.samba.org/jlayton/linux.git tags/locks-v4.4-1 for you to fetch changes up to 616fb38fa7a9599293e05ae1fa9acfaf73922434: locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait (2015-10-2= 2 14:57:42 -0400) ---------------------------------------------------------------- File locking related changes for v4.4 (pile #1) The largest series of changes is from Ben who offered up a set to add a new helper function for setting locks based on the type set in fl_flags. Dmitry also send in a fix for a potential race that he found with KTSAN. ---------------------------------------------------------------- Benjamin Coddington (4): locks: Use more file_inode and fix a comment locks: introduce locks_lock_inode_wait() Move locks API users to locks_lock_inode_wait() locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait Dmitry Vyukov (1): fs: fix data races on inode->i_flctx Jeff Layton (1): locks: change tracepoint for generic_add_lease drivers/staging/lustre/lustre/llite/file.c | 8 +-- fs/9p/vfs_file.c | 4 +- fs/ceph/locks.c | 4 +- fs/cifs/file.c | 2 +- fs/dlm/plock.c | 4 +- fs/fuse/file.c | 2 +- fs/gfs2/file.c | 8 +-- fs/lockd/clntproc.c | 13 +--- fs/locks.c | 106 ++++++++++++++++++-------= ---- fs/nfs/file.c | 13 +--- fs/nfs/nfs4proc.c | 13 +--- fs/ocfs2/locks.c | 8 +-- include/linux/fs.h | 21 ++---- include/trace/events/filelock.h | 38 ++++++++++- 14 files changed, 127 insertions(+), 117 deletions(-) --=20 Jeff Layton --Sig_/LqKB6G.zFwjdEhuZXeWWl.z Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWNsTtAAoJEAAOaEEZVoIVuooQAJ2zz64rQa19yHxaHHQ8Ly4/ 0Y7dVYOx+tQftOXUhZwmgvawC2Uu3Wu4P2QruX9axJpQYgUiF39gnY/gUkiybD3p ZR7Jog3CMiYrktORs3PfjTzcLCxNH/s4hNp93PDM/Cw2k2UeGhrXnf4Yc7BwLUuE WeFGj0xLNQYSSNBoeP8dxB9g7775yetXfaBxlWcvKAEqtwbLwbwui7akpT4IhwwK 1WPPzEgAE/u9Sg61LhSb0iMCmxo+VOa3eti9K7LkECSOWtrPDeUyfPpLRsAOtPI0 qewbVX2/36wk11gjR/Bc+YaMvSopknUxQYoQUeiJ8rtADaouwgGEloI2pKVcxXOO q6YQU4INCLXF45n7BEj43O1OYCX2UQdGDotrqkD2Vs/uS002AJFPkaV25ZpfpPaa aq6D2VoQKGLCJtiqAaapw15di1xj/j4bqp56ErZ6VZiqiuI8Zvu/avKI7EegeDRJ 2L1LqW3lZ0QYyiCIGhi8QKKfMgyin/R/Jxynz5eSv6ZeJuB8uJTr7De+VNnm+M9D eGp1tWGS+FerfH/LcNfJ5fAxNamXPDgPLg/IO75TRkdmPQQHfC8xgIvtJ0a3Vahk YqLxYeArN4V7folZTnUToQzKBFi51Hky+7pMS5ZOkbySMhVFlQdx6GLw2llBcnVl bxkFbjapUdI5PfUiDPhK =gYMo -----END PGP SIGNATURE----- --Sig_/LqKB6G.zFwjdEhuZXeWWl.z-- -- 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/