TOMOYO: Merge path_group and number_group.

Use common code for "path_group" and "number_group".

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 14 insertions, 22 deletions

diff --git a/security/tomoyo/gc.c b/security/tomoyo/gc.c
index 414e18bd93c..cf62a4ee79c 100644
--- a/security/tomoyo/gc.c
+++ b/security/tomoyo/gc.c
@@ -266,33 +266,25 @@ static void tomoyo_collect_entry(void)
                                 goto unlock;
                 }
         }
-        {
+        for (i = 0; i < TOMOYO_MAX_GROUP; i++) {
+                struct list_head *list = &tomoyo_group_list[i];
+                int id;
                 struct tomoyo_group *group;
-                list_for_each_entry_rcu(group,
-                                        &tomoyo_group_list[TOMOYO_PATH_GROUP],
-                                        list) {
-                        tomoyo_collect_member(&group->member_list,
-                                              TOMOYO_ID_PATH_GROUP);
-                        if (!list_empty(&group->member_list) ||
-                            atomic_read(&group->users))
-                                continue;
-                        if (!tomoyo_add_to_gc(TOMOYO_ID_GROUP,
-                                              &group->list))
-                                goto unlock;
+                switch (i) {
+                case 0:
+                        id = TOMOYO_ID_PATH_GROUP;
+                        break;
+                default:
+                        id = TOMOYO_ID_NUMBER_GROUP;
+                        break;
                 }
-        }
-        {
-                struct tomoyo_group *group;
-                list_for_each_entry_rcu(group,
-                                        &tomoyo_group_list[TOMOYO_NUMBER_GROUP],
-                                        list) {
-                        tomoyo_collect_member(&group->member_list,
-                                              TOMOYO_ID_NUMBER_GROUP);
+                list_for_each_entry(group, list, list) {
+                        if (!tomoyo_collect_member(&group->member_list, id))
+                                goto unlock;
                         if (!list_empty(&group->member_list) ||
                             atomic_read(&group->users))
                                 continue;
-                        if (!tomoyo_add_to_gc(TOMOYO_ID_GROUP,
-                                              &group->list))
+                        if (!tomoyo_add_to_gc(TOMOYO_ID_GROUP, &group->list))
                                 goto unlock;
                 }
         }