diff options
| author | Frederic Weisbecker <frederic@kernel.org> | 2024-06-21 11:15:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-03 08:54:16 +0200 |
| commit | 0475bba01abcf6cc193906c91443ceb569da371a (patch) | |
| tree | 0f8d4b55c22d9c746acb5cca8061fff592aa50f9 /security/keys | |
| parent | f2d6c5b8ef1169e9d012d34069e5c4e9cf9e7849 (diff) | |
| download | linux-0475bba01abcf6cc193906c91443ceb569da371a.tar.gz linux-0475bba01abcf6cc193906c91443ceb569da371a.tar.bz2 linux-0475bba01abcf6cc193906c91443ceb569da371a.zip | |
task_work: s/task_work_cancel()/task_work_cancel_func()/
commit 68cbd415dd4b9c5b9df69f0f091879e56bf5907a upstream.
A proper task_work_cancel() API that actually cancels a callback and not
*any* callback pointing to a given function is going to be needed for
perf events event freeing. Do the appropriate rename to prepare for
that.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240621091601.18227-2-frederic@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 19be69fa4d05..aa1dc43b16dd 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1694,7 +1694,7 @@ long keyctl_session_to_parent(void) goto unlock; /* cancel an already pending keyring replacement */ - oldwork = task_work_cancel(parent, key_change_session_keyring); + oldwork = task_work_cancel_func(parent, key_change_session_keyring); /* the replacement session keyring is applied just prior to userspace * restarting */ |