From: Guru Anbalagane <guru.anbalagane@oracle.com>
Date: Mon, 26 Sep 2011 20:54:40 +0000 (-0700)
Subject: Revert "[AUDIT/workaround] Increase AUDIT_NAMES array len"
X-Git-Tag: v2.6.39-400.9.0~890
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2b277d58ab6372f29028414fb93aa07197c3111a;p=users%2Fjedix%2Flinux-maple.git

Revert "[AUDIT/workaround] Increase AUDIT_NAMES array len"

This reverts commit 629b8994afa2674fac82ab01472e404e48935c9c.
---

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index d4d48ea55133..00d79df03e76 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -72,7 +72,7 @@
 
 /* AUDIT_NAMES is the number of slots we reserve in the audit_context
  * for saving names from getname(). */
-#define AUDIT_NAMES   1024 
+#define AUDIT_NAMES    20
 
 /* Indicates that audit should log the full pathname. */
 #define AUDIT_NAME_FULL -1
@@ -1902,16 +1902,14 @@ static int audit_inc_name_count(struct audit_context *context,
 {
 	if (context->name_count >= AUDIT_NAMES) {
 		if (inode)
-			printk(KERN_DEBUG "audit: name_count maxed(%d/%d), losing inode data: "
+			printk(KERN_DEBUG "audit: name_count maxed, losing inode data: "
 			       "dev=%02x:%02x, inode=%lu\n",
-			       context->name_count, AUDIT_NAMES,
 			       MAJOR(inode->i_sb->s_dev),
 			       MINOR(inode->i_sb->s_dev),
 			       inode->i_ino);
 
 		else
-			printk(KERN_DEBUG "name_count maxed(%d/%d), losing inode data\n", 
-					context->name_count, AUDIT_NAMES);
+			printk(KERN_DEBUG "name_count maxed, losing inode data\n");
 		return 1;
 	}
 	context->name_count++;