summary refs log tree commit diff
path: root/security/tomoyo/file.c
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2010-06-17 16:52:29 +0900
committerJames Morris <jmorris@namei.org>2010-08-02 15:34:40 +1000
commita98aa4debe2728abb3353e35fc5d110dcc0d7f0d (patch)
tree0334194761e26961339dd126e997c23e4060ce72 /security/tomoyo/file.c
parent5fb49870e6d48d81d8ca0e1ef979073dc9a820f7 (diff)
downloadlinux-a98aa4debe2728abb3353e35fc5d110dcc0d7f0d.tar.gz
TOMOYO: Merge tomoyo_path_group and tomoyo_number_group
"struct tomoyo_path_group" and "struct tomoyo_number_group" are identical.
Rename tomoyo_path_group/tomoyo_number_group to tomoyo_group and
tomoyo_path_group_member to tomoyo_path_group and
tomoyo_number_group_member to tomoyo_unmber_group.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo/file.c')
-rw-r--r--security/tomoyo/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
index de87c45ba9d0..6c2ba69fc89e 100644
--- a/security/tomoyo/file.c
+++ b/security/tomoyo/file.c
@@ -90,7 +90,7 @@ void tomoyo_put_name_union(struct tomoyo_name_union *ptr)
 	if (!ptr)
 		return;
 	if (ptr->is_group)
-		tomoyo_put_path_group(ptr->group);
+		tomoyo_put_group(ptr->group);
 	else
 		tomoyo_put_name(ptr->filename);
 }
@@ -106,7 +106,7 @@ bool tomoyo_compare_name_union(const struct tomoyo_path_info *name,
 void tomoyo_put_number_union(struct tomoyo_number_union *ptr)
 {
 	if (ptr && ptr->is_group)
-		tomoyo_put_number_group(ptr->group);
+		tomoyo_put_group(ptr->group);
 }
 
 bool tomoyo_compare_number_union(const unsigned long value,