Commit 3320c513 authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Eric Paris
Browse files

audit: flatten kauditd_thread wait queue code 



The wait queue control code in kauditd_thread() was nested deeper than
necessary.  The function has been flattened for better legibility.

Signed-off-by: default avatarRichard Guy Briggs <rbriggs@redhat.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent b551d1d9

kernel/audit.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -458,10 +458,11 @@ static void flush_hold_queue(void) 




static int kauditd_thread(void *dummy)

static int kauditd_thread(void *dummy)

{

{

	struct sk_buff *skb;



	set_freezable();

	set_freezable();

	while (!kthread_should_stop()) {

	while (!kthread_should_stop()) {

		struct sk_buff *skb;

		DECLARE_WAITQUEUE(wait, current);



		flush_hold_queue();

		flush_hold_queue();





		skb = skb_dequeue(&audit_skb_queue);

		skb = skb_dequeue(&audit_skb_queue);
@@ -471,8 +472,8 @@ static int kauditd_thread(void *dummy) 
				kauditd_send_skb(skb);

				kauditd_send_skb(skb);

			else

			else

				audit_printk_skb(skb);

				audit_printk_skb(skb);

		} else {

			continue;

			DECLARE_WAITQUEUE(wait, current);

		}

		set_current_state(TASK_INTERRUPTIBLE);

		set_current_state(TASK_INTERRUPTIBLE);

		add_wait_queue(&kauditd_wait, &wait);

		add_wait_queue(&kauditd_wait, &wait);
@@ -484,7 +485,6 @@ static int kauditd_thread(void *dummy) 
		__set_current_state(TASK_RUNNING);

		__set_current_state(TASK_RUNNING);

		remove_wait_queue(&kauditd_wait, &wait);

		remove_wait_queue(&kauditd_wait, &wait);

	}

	}

	}

	return 0;

	return 0;

}

}