diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-03 10:46:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-03 10:46:41 -0700 |
| commit | 3208167a865e862fff5045d7910387941ff7e114 (patch) | |
| tree | c9bf532ee262c0c7197f692c2b62cc5abe0d2282 /fs | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | locks: add locks_move_blocks in posix_lock_inode (diff) | |
| download | linux-dev-3208167a865e862fff5045d7910387941ff7e114.tar.xz linux-dev-3208167a865e862fff5045d7910387941ff7e114.zip | |
Merge tag 'filelock-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking fix from Jeff Layton:
"Just a single, one-line patch to fix an inefficiency in the posix
locking code that can lead to it doing more wakeups than necessary"
* tag 'filelock-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
locks: add locks_move_blocks in posix_lock_inode
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 7df0f9fa66f4..938fe325bc54 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1282,6 +1282,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request, if (!new_fl) goto out; locks_copy_lock(new_fl, request); + locks_move_blocks(new_fl, request); request = new_fl; new_fl = NULL; locks_insert_lock_ctx(request, &fl->fl_list); |