Skip to content

Commit b20ee48

Browse files
committed
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()
2 parents cfd2b5c + 932c29a commit b20ee48

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

fs/locks.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2129,6 +2129,7 @@ SYSCALL_DEFINE2(flock, unsigned int, fd, unsigned int, cmd)
21292129
else
21302130
error = locks_lock_file_wait(f.file, &fl);
21312131

2132+
locks_release_private(&fl);
21322133
out_putf:
21332134
fdput(f);
21342135

0 commit comments

Comments
 (0)