diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 08:58:47 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-16 08:58:47 -0600 |
| commit | 53b95d6341c142a02538e41bdf1405ef8888bf8b (patch) | |
| tree | f87d6f57029b6c101c9909cd143de34196c63b1f /Documentation | |
| parent | da06df548e2b82848bcc32342234d0f04340a41c (diff) | |
| parent | 2ece173e4715031c031de9114491eee80a69cf68 (diff) | |
| download | linux-53b95d6341c142a02538e41bdf1405ef8888bf8b.tar.bz2 | |
Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux
Pull file locking bugfixes from Jeff Layton:
"Most of these patches are to fix a long-standing regression that crept
in when the BKL was removed from the file-locking code. The code was
converted to use a conventional spinlock, but some fl_release_private
ops can block and you can end up sleeping inside the lock.
There's also a patch to make /proc/locks show delegations as 'DELEG'"
* tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux:
locks: update Locking documentation to clarify fl_release_private behavior
locks: move locks_free_lock calls in do_fcntl_add_lease outside spinlock
locks: defer freeing locks in locks_delete_lock until after i_lock has been dropped
locks: don't reuse file_lock in __posix_lock_file
locks: don't call locks_release_private from locks_copy_lock
locks: show delegations as "DELEG" in /proc/locks
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/Locking | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index b18dd1779029..f1997e9da61f 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking @@ -349,7 +349,11 @@ prototypes: locking rules: inode->i_lock may block fl_copy_lock: yes no -fl_release_private: maybe no +fl_release_private: maybe maybe[1] + +[1]: ->fl_release_private for flock or POSIX locks is currently allowed +to block. Leases however can still be freed while the i_lock is held and +so fl_release_private called on a lease should not block. ----------------------- lock_manager_operations --------------------------- prototypes: |