[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140425095739.GB22295@fieldses.org>
Date: Fri, 25 Apr 2014 05:57:39 -0400
From: "J. Bruce Fields" <bfields@...ldses.org>
To: Jeff Layton <jlayton@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] please pull file locking changes for v3.15 (pile #2)
On Thu, Apr 24, 2014 at 07:45:57AM -0400, Jeff Layton wrote:
>
> The following changes since commit 55101e2d6ce1c780f6ee8fee5f37306971aac6cd:
>
> Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (2014-04-14 16:21:28 -0700)
>
> are available in the git repository at:
>
>
> git://git.samba.org/jlayton/linux.git tags/locks-v3.15-2
>
> for you to fetch changes up to cff2fce58b2b0f59089e7edcdc38803d65057b9f:
>
> locks: rename FL_FILE_PVT and IS_FILE_PVT to use "*_OFDLCK" instead (2014-04-23 16:17:03 -0400)
>
> ----------------------------------------------------------------
> File locking related bugfixes for v3.15 (pile #2)
>
> - fix for a long-standing bug in __break_lease that can cause soft lockups
> - renaming of file-private locks to "open file description" locks, and the
> command macros to more visually distinct names.
>
> The fix for __break_lease is also in the pile of patches for which Bruce
> sent a pull request, but I assume that your merge procedure will handle
> that correctly.
>
> For the other patches, I don't like the fact that we need to rename this
> stuff at this late stage, but it should be settled now (hopefully).
>
> ----------------------------------------------------------------
> Jeff Layton (3):
> locks: allow __break_lease to sleep even when break_time is 0
> locks: rename file-private locks to "open file description locks"
Nit: they're "descriptors", not "descriptions".
But since that only affects comments and changelogs (not even the macros
names, which are using OFD), that's a very nitty nit....
--b.
> locks: rename FL_FILE_PVT and IS_FILE_PVT to use "*_OFDLCK" instead
>
> arch/arm/kernel/sys_oabi-compat.c | 6 +++---
> fs/compat.c | 14 +++++++-------
> fs/fcntl.c | 12 ++++++------
> fs/locks.c | 55 +++++++++++++++++++++++++++----------------------------
> include/linux/fs.h | 2 +-
> include/uapi/asm-generic/fcntl.h | 20 ++++++++++----------
> security/selinux/hooks.c | 6 +++---
> 7 files changed, 57 insertions(+), 58 deletions(-)
>
> --
> Jeff Layton <jlayton@...hat.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists