From 237ab459f12cb98eadd3fe7b85343e183a1076a4 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Sat, 12 Jun 2010 20:46:22 +0900 Subject: TOMOYO: Use callback for updating entries. Use common "struct list_head" + "bool" + "u8" structure and use common code for elements using that structure. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris --- security/tomoyo/gc.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'security/tomoyo/gc.c') diff --git a/security/tomoyo/gc.c b/security/tomoyo/gc.c index 8a31f0c628b2..aed7ddd0de84 100644 --- a/security/tomoyo/gc.c +++ b/security/tomoyo/gc.c @@ -310,34 +310,8 @@ static void tomoyo_collect_entry(void) struct tomoyo_acl_info *acl; list_for_each_entry_rcu(acl, &domain->acl_info_list, list) { - switch (acl->type) { - case TOMOYO_TYPE_PATH_ACL: - if (container_of(acl, - struct tomoyo_path_acl, - head)->perm) - continue; - break; - case TOMOYO_TYPE_PATH2_ACL: - if (container_of(acl, - struct tomoyo_path2_acl, - head)->perm) - continue; - break; - case TOMOYO_TYPE_PATH_NUMBER_ACL: - if (container_of(acl, - struct tomoyo_path_number_acl, - head)->perm) - continue; - break; - case TOMOYO_TYPE_PATH_NUMBER3_ACL: - if (container_of(acl, - struct tomoyo_path_number3_acl, - head)->perm) - continue; - break; - default: + if (!acl->is_deleted) continue; - } if (tomoyo_add_to_gc(TOMOYO_ID_ACL, acl)) list_del_rcu(&acl->list); else -- cgit v1.2.3-58-ga151