[PATCH 2/6] audit: flatten kauditd_thread wait queue code
From: Richard Guy Briggs 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 --- This is a code clean up in preparation to add a multicast netlink socket to kaudit for read-only userspace clients such as systemd, in addition to the bidirectional audit userspace client. kernel/audit.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 4bf486c..1531efb 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -458,10 +458,11 @@ static void flush_hold_queue(void) static int kauditd_thread(void *dummy) { - struct sk_buff *skb; - set_freezable(); while (!kthread_should_stop()) { + struct sk_buff *skb; + DECLARE_WAITQUEUE(wait, current); + flush_hold_queue(); skb = skb_dequeue(_skb_queue); @@ -471,19 +472,18 @@ static int kauditd_thread(void *dummy) kauditd_send_skb(skb); else audit_printk_skb(skb); - } else { - DECLARE_WAITQUEUE(wait, current); - set_current_state(TASK_INTERRUPTIBLE); - add_wait_queue(_wait, ); - - if (!skb_queue_len(_skb_queue)) { - try_to_freeze(); - schedule(); - } + continue; + } + set_current_state(TASK_INTERRUPTIBLE); + add_wait_queue(_wait, ); - __set_current_state(TASK_RUNNING); - remove_wait_queue(_wait, ); + if (!skb_queue_len(_skb_queue)) { + try_to_freeze(); + schedule(); } + + __set_current_state(TASK_RUNNING); + remove_wait_queue(_wait, ); } return 0; } -- 1.8.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/6] audit: flatten kauditd_thread wait queue code
From: Richard Guy Briggs r...@redhat.com 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 rbri...@redhat.com --- This is a code clean up in preparation to add a multicast netlink socket to kaudit for read-only userspace clients such as systemd, in addition to the bidirectional audit userspace client. kernel/audit.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 4bf486c..1531efb 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -458,10 +458,11 @@ static void flush_hold_queue(void) static int kauditd_thread(void *dummy) { - struct sk_buff *skb; - set_freezable(); while (!kthread_should_stop()) { + struct sk_buff *skb; + DECLARE_WAITQUEUE(wait, current); + flush_hold_queue(); skb = skb_dequeue(audit_skb_queue); @@ -471,19 +472,18 @@ static int kauditd_thread(void *dummy) 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); } return 0; } -- 1.8.0.2 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/