Parcourir la source

[PATCH] kauditd_thread warning fix

Squash this warning:

  kernel/audit.c: In function 'kauditd_thread':
  kernel/audit.c:367: warning: no return statement in function returning non-void

We might as test kthread_should_stop(), although it's not very pointful at
present.

The code which starts this thread looks racy - the kernel could start multiple
threads.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton il y a 18 ans
Parent
commit
4899b8b16b
1 fichiers modifiés avec 2 ajouts et 1 suppressions
  1. 2 1
      kernel/audit.c

+ 2 - 1
kernel/audit.c

@@ -340,7 +340,7 @@ static int kauditd_thread(void *dummy)
 {
 {
 	struct sk_buff *skb;
 	struct sk_buff *skb;
 
 
-	while (1) {
+	while (!kthread_should_stop()) {
 		skb = skb_dequeue(&audit_skb_queue);
 		skb = skb_dequeue(&audit_skb_queue);
 		wake_up(&audit_backlog_wait);
 		wake_up(&audit_backlog_wait);
 		if (skb) {
 		if (skb) {
@@ -369,6 +369,7 @@ static int kauditd_thread(void *dummy)
 			remove_wait_queue(&kauditd_wait, &wait);
 			remove_wait_queue(&kauditd_wait, &wait);
 		}
 		}
 	}
 	}
+	return 0;
 }
 }
 
 
 int audit_send_list(void *_dest)
 int audit_send_list(void *_dest)