summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorFrederic Weisbecker <frederic@kernel.org>2024-06-21 12:15:58 +0300
committerPeter Zijlstra <peterz@infradead.org>2024-07-09 14:26:31 +0300
commit68cbd415dd4b9c5b9df69f0f091879e56bf5907a (patch)
tree123a5658e3ff617bcef2788e7fd77973e38d4b1a /security
parent57e11990f45f89bc29d0f84dd7b13a4e4263eeb2 (diff)
downloadlinux-68cbd415dd4b9c5b9df69f0f091879e56bf5907a.tar.xz
task_work: s/task_work_cancel()/task_work_cancel_func()/
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
Diffstat (limited to 'security')
-rw-r--r--security/keys/keyctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 4bc3e9398ee3..ab927a142f51 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 */