diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:15:21 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:15:21 +0000 |
commit | 1c1ddb052494b49a5dd1ab77294028c885753b28 (patch) | |
tree | fedf735083e230160517562a3dceba48a0b1418d /fs/locks.c | |
parent | Releasing progress-linux version 6.9.9-1~progress7.99u1. (diff) | |
download | linux-1c1ddb052494b49a5dd1ab77294028c885753b28.tar.xz linux-1c1ddb052494b49a5dd1ab77294028c885753b28.zip |
Merging upstream version 6.9.10.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index c360d1992d..bdd94c3225 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1367,9 +1367,9 @@ retry: locks_wake_up_blocks(&left->c); } out: + trace_posix_lock_inode(inode, request, error); spin_unlock(&ctx->flc_lock); percpu_up_read(&file_rwsem); - trace_posix_lock_inode(inode, request, error); /* * Free any unused locks. */ |