From d884596f44ef5a0bcd8a66405dc04902aeaa6fc7 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 16 Dec 2005 10:48:28 +0000
Subject: [PATCH] [PATCH] Minor cosmetic cleanups to the code moved into
auditfilter.c
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---
kernel/auditfilter.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 7f347c360876..a3a32752f973 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -69,7 +69,7 @@ static inline int audit_copy_rule(struct audit_rule *d, struct audit_rule *s)
/* Check to see if two rules are identical. It is called from
* audit_add_rule during AUDIT_ADD and
* audit_del_rule during AUDIT_DEL. */
-static inline int audit_compare_rule(struct audit_rule *a, struct audit_rule *b)
+static int audit_compare_rule(struct audit_rule *a, struct audit_rule *b)
{
int i;
@@ -107,19 +107,18 @@ static inline int audit_add_rule(struct audit_rule *rule,
/* Do not use the _rcu iterator here, since this is the only
* addition routine. */
list_for_each_entry(entry, list, list) {
- if (!audit_compare_rule(rule, &entry->rule)) {
+ if (!audit_compare_rule(rule, &entry->rule))
return -EEXIST;
- }
}
for (i = 0; i < rule->field_count; i++) {
if (rule->fields[i] & AUDIT_UNUSED_BITS)
return -EINVAL;
- if ( rule->fields[i] & AUDIT_NEGATE )
+ if ( rule->fields[i] & AUDIT_NEGATE)
rule->fields[i] |= AUDIT_NOT_EQUAL;
else if ( (rule->fields[i] & AUDIT_OPERATORS) == 0 )
rule->fields[i] |= AUDIT_EQUAL;
- rule->fields[i] &= (~AUDIT_NEGATE);
+ rule->fields[i] &= ~AUDIT_NEGATE;
}
if (!(entry = kmalloc(sizeof(*entry), GFP_KERNEL)))
@@ -374,5 +373,3 @@ unlock_and_return:
rcu_read_unlock();
return result;
}
-
-
--
GitLab