The wait queue control code in kauditd_thread() was nested deeper than
necessary. The function has been flattened for better legibility.
Signed-off-by: Richard Guy Briggs <rbriggs@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
static int kauditd_thread(void *dummy)
{
static int kauditd_thread(void *dummy)
{
set_freezable();
while (!kthread_should_stop()) {
set_freezable();
while (!kthread_should_stop()) {
+ struct sk_buff *skb;
+ DECLARE_WAITQUEUE(wait, current);
+
flush_hold_queue();
skb = skb_dequeue(&audit_skb_queue);
flush_hold_queue();
skb = skb_dequeue(&audit_skb_queue);
kauditd_send_skb(skb);
else
audit_printk_skb(skb);
kauditd_send_skb(skb);
else
audit_printk_skb(skb);
- } else {
- DECLARE_WAITQUEUE(wait, current);
- set_current_state(TASK_INTERRUPTIBLE);
- add_wait_queue(&kauditd_wait, &wait);
-
- if (!skb_queue_len(&audit_skb_queue)) {
- try_to_freeze();
- schedule();
- }
+ continue;
+ }
+ set_current_state(TASK_INTERRUPTIBLE);
+ add_wait_queue(&kauditd_wait, &wait);
- __set_current_state(TASK_RUNNING);
- remove_wait_queue(&kauditd_wait, &wait);
+ if (!skb_queue_len(&audit_skb_queue)) {
+ try_to_freeze();
+ schedule();
+
+ __set_current_state(TASK_RUNNING);
+ remove_wait_queue(&kauditd_wait, &wait);