Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[firefly-linux-kernel-4.4.55.git] / security / tomoyo / util.c

diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c
index 20abba22af42dc4ad18d93a601396abd348779aa..9bfc1ee8222ddf6c9edadb48067e5384f0598e8c 100644 (file)
--- a/security/tomoyo/util.c
+++ b/security/tomoyo/util.c
@@ -26,7 +26,7 @@ bool tomoyo_policy_loaded;
  * The @src is updated to point the first character after the value
  * on success.
  */
-u8 tomoyo_parse_ulong(unsigned long *result, char **str)
+static u8 tomoyo_parse_ulong(unsigned long *result, char **str)
 {
        const char *cp = *str;
        char *ep;
@@ -844,7 +844,7 @@ int tomoyo_init_request_info(struct tomoyo_request_info *r,
  *
  * Returns the last word of a line.
  */
-static const char *tomoyo_last_word(const char *name)
+const char *tomoyo_last_word(const char *name)
 {
        const char *cp = strrchr(name, ' ');
        if (cp)
@@ -911,7 +911,7 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_request_info *r)
        if (!domain)
                return true;
        list_for_each_entry_rcu(ptr, &domain->acl_info_list, list) {
-               if (!ptr->is_deleted)
+               if (ptr->is_deleted)
                        continue;
                switch (ptr->type) {
                        u16 perm;