SOURCES (LINUX_2_6_27): kernel-apparmor.patch - better way

[arekm]

Author: arekm                        Date: Mon Mar 16 17:33:52 2009 GMT
Module: SOURCES                       Tag: LINUX_2_6_27
---- Log message:
- better way

---- Files affected:
SOURCES:
   kernel-apparmor.patch (1.1.2.5.2.1 -> 1.1.2.5.2.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-apparmor.patch
diff -u SOURCES/kernel-apparmor.patch:1.1.2.5.2.1 SOURCES/kernel-apparmor.patch:1.1.2.5.2.2
--- SOURCES/kernel-apparmor.patch:1.1.2.5.2.1	Mon Mar 16 12:26:05 2009
+++ SOURCES/kernel-apparmor.patch	Mon Mar 16 18:33:47 2009
@@ -2991,7 +2991,7 @@
 +			printk(KERN_DEBUG "AppArmor: " fmt, ##args);	\
 +	} while (0)
 +
-+#define AA_ERROR(fmt, args...)	printk(KERN_ERR "AppArmor: " fmt, ##args)
++#define AA_ERROR(fmt, args...)	do { if (printk_ratelimit()) printk(KERN_ERR "AppArmor: " fmt, ##args) } while (0)
 +
 +/* struct aa_rlimit - rlimits settings for the profile
 + * @mask: which hard limits to set
@@ -5309,8 +5309,8 @@
 +	ab = audit_log_start(audit_cxt, sa->gfp_mask, type);
 +
 +	if (!ab) {
-+		if (printk_ratelimit())
-+			AA_ERROR("Unable to log event (%d) to audit subsys\n",type);
++		AA_ERROR("Unable to log event (%d) to audit subsys\n",
++			 type);
 +		 /* don't fail operations in complain mode even if logging
 +		  * fails */
 +		return type == AUDIT_APPARMOR_ALLOWED ? 0 : -ENOMEM;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-apparmor.patch?r1=1.1.2.5.2.1&r2=1.1.2.5.2.2&f=u