diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-22 10:40:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-22 10:40:09 -0700 |
| commit | b20ee4813f3fe79f5ee227c576a55c2df5d59078 (patch) | |
| tree | a7f59edecac1b1085a28d947d0e73f3a7ecb1a4a /fs | |
| parent | perf tools: Fix compile error for x86 (diff) | |
| parent | locks: Fix dropped call to ->fl_release_private() (diff) | |
| download | linux-dev-b20ee4813f3fe79f5ee227c576a55c2df5d59078.tar.xz linux-dev-b20ee4813f3fe79f5ee227c576a55c2df5d59078.zip | |
Merge tag 'filelock-v6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking fix from Jeff Layton:
"Just a single patch for a bugfix in the flock() codepath, introduced
by a patch that went in recently"
* tag 'filelock-v6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
locks: Fix dropped call to ->fl_release_private()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/locks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/locks.c b/fs/locks.c index c266cfdc3291..607f94a0e789 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2129,6 +2129,7 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd) else error = locks_lock_file_wait(f.file, &fl); + locks_release_private(&fl); out_putf: fdput(f); |