diff options
| author | Frederic Weisbecker <frederic@kernel.org> | 2024-06-21 11:15:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 05:40:57 +0200 |
| commit | 1fd27cc6f0a540f97d29bd695521a3bb57d02f33 (patch) | |
| tree | b393e124a9c7aecbdf69fad1efbd8be5a0336fca /security | |
| parent | 973155ca67fef3038d5d752f7076c45a010e1b43 (diff) | |
| download | linux-1fd27cc6f0a540f97d29bd695521a3bb57d02f33.tar.gz linux-1fd27cc6f0a540f97d29bd695521a3bb57d02f33.tar.bz2 linux-1fd27cc6f0a540f97d29bd695521a3bb57d02f33.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')
| -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 e3ffaf5ad639..c283474ecea5 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 */ |