diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 15:46:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 15:46:17 -0800 |
| commit | 065019a38feab5f2659cbd44080d528f8dff0b00 (patch) | |
| tree | 80e8fcd6fea433ba9ddd3a3ba9333446947be78f /fs/cifs/cifsfs.h | |
| parent | Merge branch 'for-linus-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml (diff) | |
| parent | locks: rename __posix_lock_file to posix_lock_inode (diff) | |
| download | linux-dev-065019a38feab5f2659cbd44080d528f8dff0b00.tar.xz linux-dev-065019a38feab5f2659cbd44080d528f8dff0b00.zip | |
Merge tag 'locks-v4.5-1' of git://git.samba.org/jlayton/linux
Pull file locking updates from Jeff Layton:
"File locking related changes for v4.5 (pile #1)
Highlights:
- new Kconfig option to allow disabling mandatory locking (which is
racy anyway)
- new tracepoints for setlk and close codepaths
- fix for a long-standing bug in code that handles races between
setting a POSIX lock and close()"
* tag 'locks-v4.5-1' of git://git.samba.org/jlayton/linux:
locks: rename __posix_lock_file to posix_lock_inode
locks: prink more detail when there are leaked locks
locks: pass inode pointer to locks_free_lock_context
locks: sprinkle some tracepoints around the file locking code
locks: don't check for race with close when setting OFD lock
locks: fix unlock when fcntl_setlk races with a close
fs: make locks.c explicitly non-modular
locks: use list_first_entry_or_null()
locks: Don't allow mounts in user namespaces to enable mandatory locking
locks: Allow disabling mandatory locking at compile time
Diffstat (limited to 'fs/cifs/cifsfs.h')
0 files changed, 0 insertions, 0 deletions