TOMOYO: Remove wrapper function for reading keyword.

Keyword strings are read-only. We can directly access them to reduce code size.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 1a22fff89e70..ba8360382895 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -812,7 +812,7 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
                         continue;
                 pos = head->read_avail;
                 if (!tomoyo_io_printf(head, "allow_%s ",
-                                      tomoyo_path2keyword(bit)) ||
+                                      tomoyo_path_keyword[bit]) ||
                     !tomoyo_print_name_union(head, &ptr->name) ||
                     !tomoyo_io_printf(head, "\n"))
                         goto out;
@@ -845,7 +845,7 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
                         continue;
                 pos = head->read_avail;
                 if (!tomoyo_io_printf(head, "allow_%s ",
-                                      tomoyo_path22keyword(bit)) ||
+                                      tomoyo_path2_keyword[bit]) ||
                     !tomoyo_print_name_union(head, &ptr->name1) ||
                     !tomoyo_print_name_union(head, &ptr->name2) ||
                     !tomoyo_io_printf(head, "\n"))
@@ -879,7 +879,7 @@ static bool tomoyo_print_path_number_acl(struct tomoyo_io_buffer *head,
                         continue;
                 pos = head->read_avail;
                 if (!tomoyo_io_printf(head, "allow_%s",
-                                      tomoyo_path_number2keyword(bit)) ||
+                                      tomoyo_path_number_keyword[bit]) ||
                     !tomoyo_print_name_union(head, &ptr->name) ||
                     !tomoyo_print_number_union(head, &ptr->number) ||
                     !tomoyo_io_printf(head, "\n"))
@@ -913,7 +913,7 @@ static bool tomoyo_print_mkdev_acl(struct tomoyo_io_buffer *head,
                         continue;
                 pos = head->read_avail;
                 if (!tomoyo_io_printf(head, "allow_%s",
-                                      tomoyo_mkdev2keyword(bit)) ||
+                                      tomoyo_mkdev_keyword[bit]) ||
                     !tomoyo_print_name_union(head, &ptr->name) ||
                     !tomoyo_print_number_union(head, &ptr->mode) ||
                     !tomoyo_print_number_union(head, &ptr->major) ||