2023-05-11 05:24:45

by Eiichi Tsukata

Subject: [PATCH v2 3/5] audit: convert DECLARE_WAITQUEUE to DEFINE_WAIT

As there is no need to use DECLARE_WAITQUEUE, use simpler DEFINE_WAIT.

Signed-off-by: Eiichi Tsukata <[email protected]>
---
kernel/audit.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 89e119ccda76..bcbb0ba33c84 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -640,13 +640,13 @@ static void kauditd_retry_skb(struct sk_buff *skb, __always_unused int error)
static long wait_for_kauditd(long stime)
{
long rtime;
- DECLARE_WAITQUEUE(wait, current);
+ DEFINE_WAIT(wait);

- add_wait_queue_exclusive(&audit_backlog_wait, &wait);
- set_current_state(TASK_UNINTERRUPTIBLE);
+ prepare_to_wait_exclusive(&audit_backlog_wait, &wait,
+ TASK_UNINTERRUPTIBLE);
rtime = schedule_timeout(stime);
atomic_add(stime - rtime, &audit_backlog_wait_time_actual);
- remove_wait_queue(&audit_backlog_wait, &wait);
+ finish_wait(&audit_backlog_wait, &wait);

return rtime;
}
--
2.40.0

2023-05-19 20:58:21

by Paul Moore

Subject: Re: [PATCH v2 3/5] audit: convert DECLARE_WAITQUEUE to DEFINE_WAIT

On May 11, 2023 Eiichi Tsukata <[email protected]> wrote:
>
> As there is no need to use DECLARE_WAITQUEUE, use simpler DEFINE_WAIT.
>
> Signed-off-by: Eiichi Tsukata <[email protected]>
> ---
> kernel/audit.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)

This change looks reasonable, but it needs to be reworked to take into
consideration the comments in patch 2/5.

--
paul-moore.com