This patchset is the fifth posting of this set. The big change in this set is that it adds new fcntl cmd values instead of l_type values. I think that will make the interface cleaner for userland, but it does mean wading through the morass of arch-specific cmd definitions. Here is a summary of the more notable changes: v5: - switch to adding new cmd values instead of new l_type values - corrected patch by Bruce to fix up range overflow handling - patch to add Bruce and I as maintainers for fs/locks.c - disable deadlock detection for file-private locks v4: - prefixed the set with the rest of the locks.c patches I have. - added patch to get rid of BUG() call in locks_remove_flock. I think a WARN + delete the lock is sufficient there. - added patches from Bruce to consolidate the struct flock/flock64 to file_lock conversion code - fixed locks_remove_file not to assume that filp-private locks won't be added on filesystems that have a ->lock method. v3: - more consolidation of common code between flock_to_posix_lock and flock_to_posix_lock64 - better bisectability by reordering changes, such that partial implementation won't be exposed - s/filp/file/ s/FILP/FILE/ in symbol names v2: - inheritance semantics have been change to be more BSD-lock like - patchset size has been reduced by changing how lock ownership is handled - new F_UNLCKP l_type value has been added Note too that I've gone ahead and opened a request for the POSIX folks to consider adding this to the POSIX spec once we have something mergeable. They seem amenable to the idea but don't want to enshrine it into the standard until there's a real implementation of it: http://austingroupbugs.net/view.php?id=768 I also owe them a better writeup of the semantics for these new locks, but have been holding off on doing that until they're a little more settled. I have written a fcntl(2) manpage update for this that I will send to the list. J. Bruce Fields (1): locks: fix posix lock range overflow handling Jeff Layton (13): locks: close potential race between setlease and open locks: clean up comment typo locks: remove "inline" qualifier from fl_link manipulation functions locks: add __acquires and __releases annotations to locks_start and locks_stop locks: eliminate BUG() call when there's an unexpected lock on file close locks: consolidate checks for compatible filp->f_mode values in setlk handlers MAINTAINERS: add Bruce and myself to list of maintainers for file locking code locks: rename locks_remove_flock to locks_remove_file locks: make /proc/locks show IS_FILE_PVT locks with a P suffix locks: report l_pid as -1 for FL_FILE_PVT locks locks: pass the cmd value to fcntl_getlk/getlk64 locks: skip deadlock detection on FL_FILE_PVT locks locks: add new fcntl cmd values for handling file private locks MAINTAINERS | 2 + arch/arm/kernel/sys_oabi-compat.c | 6 + arch/arm64/include/asm/compat.h | 3 + arch/mips/include/asm/compat.h | 3 + arch/mips/include/uapi/asm/fcntl.h | 3 + arch/parisc/include/uapi/asm/fcntl.h | 3 + arch/powerpc/include/asm/compat.h | 3 + arch/s390/include/asm/compat.h | 9 +- arch/sparc/include/asm/compat.h | 3 + arch/tile/include/asm/compat.h | 3 + arch/x86/include/asm/compat.h | 3 + fs/compat.c | 48 ++++- fs/fcntl.c | 30 +-- fs/file_table.c | 2 +- fs/locks.c | 342 ++++++++++++++++++++--------------- include/linux/fs.h | 21 ++- include/uapi/asm-generic/fcntl.h | 27 ++- security/selinux/hooks.c | 6 + 18 files changed, 345 insertions(+), 172 deletions(-) -- 1.8.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html