lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS

[pandora-kernel.git] / kernel / auditfilter.c

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index fbf24d1..713098e 100644 (file)
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -135,18 +135,18 @@ static void audit_remove_watch(struct audit_watch *watch)
 static inline void audit_free_rule(struct audit_entry *e)
 {
        int i;
-
+       struct audit_krule *erule = &e->rule;
        /* some rules don't have associated watches */
-       if (e->rule.watch)
-               audit_put_watch(e->rule.watch);
-       if (e->rule.fields)
-               for (i = 0; i < e->rule.field_count; i++) {
-                       struct audit_field *f = &e->rule.fields[i];
+       if (erule->watch)
+               audit_put_watch(erule->watch);
+       if (erule->fields)
+               for (i = 0; i < erule->field_count; i++) {
+                       struct audit_field *f = &erule->fields[i];
                        kfree(f->lsm_str);
                        security_audit_rule_free(f->lsm_rule);
                }
-       kfree(e->rule.fields);
-       kfree(e->rule.filterkey);
+       kfree(erule->fields);
+       kfree(erule->filterkey);
        kfree(e);
 }
 
@@ -1028,7 +1028,7 @@ static void audit_update_watch(struct audit_parent *parent,
 
                if (audit_enabled) {
                        struct audit_buffer *ab;
-                       ab = audit_log_start(NULL, GFP_KERNEL,
+                       ab = audit_log_start(NULL, GFP_NOFS,
                                AUDIT_CONFIG_CHANGE);
                        audit_log_format(ab, "auid=%u ses=%u",
                                audit_get_loginuid(current),
@@ -1067,7 +1067,7 @@ static void audit_remove_parent_watches(struct audit_parent *parent)
                        e = container_of(r, struct audit_entry, rule);
                        if (audit_enabled) {
                                struct audit_buffer *ab;
-                               ab = audit_log_start(NULL, GFP_KERNEL,
+                               ab = audit_log_start(NULL, GFP_NOFS,
                                        AUDIT_CONFIG_CHANGE);
                                audit_log_format(ab, "auid=%u ses=%u",
                                        audit_get_loginuid(current),