diff options
| author | Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> | 2009-06-19 03:29:34 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-19 03:32:37 +0200 |
| commit | ccf135f509abdbf607e9a68f08ddeee2c66dc36e (patch) | |
| tree | 4641f30dc45901b619a86957efc72fd3d8d46228 /security/tomoyo/domain.c | |
| parent | Merge branch 'master' into next (diff) | |
| download | linux-ccf135f509abdbf607e9a68f08ddeee2c66dc36e.tar.xz linux-ccf135f509abdbf607e9a68f08ddeee2c66dc36e.zip | |
TOMOYO: Move tomoyo_delete_domain().
We can mark tomoyo_delete_domain() as a "static" function
by moving it from domain.c to common.c .
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/domain.c')
| -rw-r--r-- | security/tomoyo/domain.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c index 1d8b16960576..e68b1052354b 100644 --- a/security/tomoyo/domain.c +++ b/security/tomoyo/domain.c @@ -717,38 +717,6 @@ int tomoyo_write_alias_policy(char *data, const bool is_delete) return tomoyo_update_alias_entry(data, cp, is_delete); } -/* Domain create/delete handler. */ - -/** - * tomoyo_delete_domain - Delete a domain. - * - * @domainname: The name of domain. - * - * Returns 0. - */ -int tomoyo_delete_domain(char *domainname) -{ - struct tomoyo_domain_info *domain; - struct tomoyo_path_info name; - - name.name = domainname; - tomoyo_fill_path_info(&name); - down_write(&tomoyo_domain_list_lock); - /* Is there an active domain? */ - list_for_each_entry(domain, &tomoyo_domain_list, list) { - /* Never delete tomoyo_kernel_domain */ - if (domain == &tomoyo_kernel_domain) - continue; - if (domain->is_deleted || - tomoyo_pathcmp(domain->domainname, &name)) - continue; - domain->is_deleted = true; - break; - } - up_write(&tomoyo_domain_list_lock); - return 0; -} - /** * tomoyo_find_or_assign_new_domain - Create a domain. * |