diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 23:24:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 23:24:39 +0300 |
| commit | befbfe07e646d9ffc5be1e2c943aefa5e23bf3b8 (patch) | |
| tree | cc78977d02f5c618da5174bdeba4debebbac7b2b /mm | |
| parent | 2f9ef0559efbee18a10a3ca26eefe57f69918693 (diff) | |
| parent | cbe6fc4e01421c890d74422cdd04c6b1c8f62dda (diff) | |
| download | linux-befbfe07e646d9ffc5be1e2c943aefa5e23bf3b8.tar.xz | |
Merge tag 'locks-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton:
"When we reworked the blocked locks into a tree structure instead of a
flat list a few releases ago, we lost the ability to see all of the
file locks in /proc/locks. Luo's patch fixes it to dump out all of the
blocked locks instead, which restores the full output.
This changes the format of /proc/locks as the blocked locks are shown
at multiple levels of indentation now, but lslocks (the only common
program I've ID'ed that scrapes this info) seems to be OK with that.
Tian also contributed a small patch to remove a useless assignment"
* tag 'locks-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
fs/locks: remove useless assignment in fcntl_getlk
fs/locks: print full locks information
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions