diff options
author | Yaowei Bai <bywxiaobai@163.com> | 2015-11-04 08:23:51 -0500 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2015-11-04 08:23:51 -0500 |
commit | 6f1b5d7afe1d737b7ca726e08e26f2e0367876d2 (patch) | |
tree | 19d282f149497913afac9a9ed25389e5ee3f6199 | |
parent | 9fcf836b215ca5685030ecab3e35ecc14ee3bcfb (diff) |
audit: audit_tree_match can be boolean
This patch makes audit_tree_match return bool to improve readability
due to this particular function only using either one or zero as its
return value.
No functional change.
Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
[PM: tweaked the subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
-rw-r--r-- | kernel/audit.h | 2 | ||||
-rw-r--r-- | kernel/audit_tree.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/audit.h b/kernel/audit.h index dadf86a0e59e..de6cbb7cf547 100644 --- a/kernel/audit.h +++ b/kernel/audit.h | |||
@@ -301,7 +301,7 @@ extern int audit_exe_compare(struct task_struct *tsk, struct audit_fsnotify_mark | |||
301 | #ifdef CONFIG_AUDIT_TREE | 301 | #ifdef CONFIG_AUDIT_TREE |
302 | extern struct audit_chunk *audit_tree_lookup(const struct inode *); | 302 | extern struct audit_chunk *audit_tree_lookup(const struct inode *); |
303 | extern void audit_put_chunk(struct audit_chunk *); | 303 | extern void audit_put_chunk(struct audit_chunk *); |
304 | extern int audit_tree_match(struct audit_chunk *, struct audit_tree *); | 304 | extern bool audit_tree_match(struct audit_chunk *, struct audit_tree *); |
305 | extern int audit_make_tree(struct audit_krule *, char *, u32); | 305 | extern int audit_make_tree(struct audit_krule *, char *, u32); |
306 | extern int audit_add_tree_rule(struct audit_krule *); | 306 | extern int audit_add_tree_rule(struct audit_krule *); |
307 | extern int audit_remove_tree_rule(struct audit_krule *); | 307 | extern int audit_remove_tree_rule(struct audit_krule *); |
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 94ecdabda8e6..5efe9b299a12 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -197,13 +197,13 @@ struct audit_chunk *audit_tree_lookup(const struct inode *inode) | |||
197 | return NULL; | 197 | return NULL; |
198 | } | 198 | } |
199 | 199 | ||
200 | int audit_tree_match(struct audit_chunk *chunk, struct audit_tree *tree) | 200 | bool audit_tree_match(struct audit_chunk *chunk, struct audit_tree *tree) |
201 | { | 201 | { |
202 | int n; | 202 | int n; |
203 | for (n = 0; n < chunk->count; n++) | 203 | for (n = 0; n < chunk->count; n++) |
204 | if (chunk->owners[n].owner == tree) | 204 | if (chunk->owners[n].owner == tree) |
205 | return 1; | 205 | return true; |
206 | return 0; | 206 | return false; |
207 | } | 207 | } |
208 | 208 | ||
209 | /* tagging and untagging inodes with trees */ | 209 | /* tagging and untagging inodes with trees */ |