summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-08-22 20:40:09 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-08-22 20:40:09 +0300
commitb20ee4813f3fe79f5ee227c576a55c2df5d59078 (patch)
treea7f59edecac1b1085a28d947d0e73f3a7ecb1a4a /fs
parentcfd2b5c1106fa20254d9f24970232cdf24860005 (diff)
parent932c29a10d5d0bba63b9f505a8ec1e3ce8c02542 (diff)
downloadlinux-b20ee4813f3fe79f5ee227c576a55c2df5d59078.tar.xz
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.c1
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);