From d6e4d69d24ad7a12cdf0ecf02096d604d62b685d Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@osdl.org>
Date: Fri, 29 Apr 2005 17:19:14 +0100
Subject: [PATCH] --- yaml --- r: 590 b: refs/heads/master c:
 37509e749dc2072e667db806ef24b9e897f61b8a h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/audit.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 49767507dee2..49c70c15a912 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c94c257c88c517f251da273a15c654224c7b6e21
+refs/heads/master: 37509e749dc2072e667db806ef24b9e897f61b8a
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index 587d3b2eba7f..4a697c73faec 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -142,7 +142,6 @@ struct audit_buffer {
 	int		     total;
 	int		     type;
 	int		     pid;
-	int		     count; /* Times requeued */
 };
 
 void audit_set_type(struct audit_buffer *ab, int type)
@@ -526,9 +525,9 @@ static inline int audit_log_drain(struct audit_buffer *ab)
 			retval = netlink_unicast(audit_sock, skb, audit_pid,
 						 MSG_DONTWAIT);
 		}
-		if (retval == -EAGAIN && ab->count < 5) {
-			++ab->count;
-			skb_queue_tail(&ab->sklist, skb);
+		if (retval == -EAGAIN &&
+		    (atomic_read(&audit_backlog)) < audit_backlog_limit) {
+			skb_queue_head(&ab->sklist, skb);
 			audit_log_end_irq(ab);
 			return 1;
 		}
@@ -666,7 +665,6 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
 	ab->total = 0;
 	ab->type  = AUDIT_KERNEL;
 	ab->pid   = 0;
-	ab->count = 0;
 
 #ifdef CONFIG_AUDITSYSCALL
 	if (ab->ctx)