On Wed, Mar 19, 2014 at 04:45:44PM -0400, Jeff Layton wrote: > This is a re-posting of patches that I have queued for 3.15. There's > really nothing new in this pile vs. the last several sets that I've > posted. This is mainly just a re-posting of them all as one complete > set. The only real difference is a fix for one of the mandatory locking > patches when CONFIG_FILE_LOCKING is disabled (many thanks to AKPM for > pointing that out). > > Most of this pile has been sitting in linux-next since 3.14-rc1, and > I've heard zero complaints aside from a minor merge conflict with one of > Heiko Carstens's patches. A few patches were added later and haven't > been soaking in linux-next for as long, but they've been there for a > little while now. For what it's worth, I also ran this through my regression tests (cthon, pynfs, plus a few other small lock tests, locally and over v3 and v4), and didn't see any problems. Of course that doesn't exercise the new lock type. --b. > > Al would you be willing to take these into your tree and merge them up > to Linus for 3.15 (assuming no one objects, of cours)? It may be easier > to cherry pick them from my linux-next branch: > > git://git.samba.org/jlayton/linux.git linux-next > > Thanks! Comments and suggestions welcome... > > J. Bruce Fields (1): > locks: fix posix lock range overflow handling > > Jeff Layton (16): > 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 > locks: rename locks_remove_flock to locks_remove_file > MAINTAINERS: add Bruce and myself to list of maintainers for file > locking code > 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 > locks: require that flock->l_pid be set to 0 for file-private locks > locks: fix locks_mandatory_locked to respect file-private locks > locks: make locks_mandatory_area check for file-private locks > > MAINTAINERS | 2 + > arch/arm/kernel/sys_oabi-compat.c | 3 + > fs/compat.c | 35 +++- > fs/fcntl.c | 37 ++-- > fs/file_table.c | 2 +- > fs/locks.c | 387 ++++++++++++++++++++++++-------------- > fs/namei.c | 2 +- > include/linux/fs.h | 43 +++-- > include/uapi/asm-generic/fcntl.h | 19 +- > mm/mmap.c | 2 +- > mm/nommu.c | 2 +- > security/selinux/hooks.c | 3 + > 12 files changed, 354 insertions(+), 183 deletions(-) > > -- > 1.8.5.3 > -- 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
