Skip to content

Commit

Permalink
selinux: rename sel_remove_bools() for more general usage.
Browse files Browse the repository at this point in the history
sel_remove_bools() will also be used by the object class discovery, rename
it for more general use.

Signed-off-by: Christopher J. PeBenito <cpebenito@tresys.com>
Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
Christopher J. PeBenito authored and James Morris committed Jul 12, 2007
1 parent 55fcf09 commit 0c92d7c
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions security/selinux/selinuxfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -940,9 +940,8 @@ static const struct file_operations sel_commit_bools_ops = {
.write = sel_commit_bools_write,
};

/* delete booleans - partial revoke() from
* fs/proc/generic.c proc_kill_inodes */
static void sel_remove_bools(struct dentry *de)
/* partial revoke() from fs/proc/generic.c proc_kill_inodes */
static void sel_remove_entries(struct dentry *de)
{
struct list_head *p, *node;
struct super_block *sb = de->d_sb;
Expand Down Expand Up @@ -998,7 +997,7 @@ static int sel_make_bools(void)
kfree(bool_pending_values);
bool_pending_values = NULL;

sel_remove_bools(dir);
sel_remove_entries(dir);

if (!(page = (char*)get_zeroed_page(GFP_KERNEL)))
return -ENOMEM;
Expand Down Expand Up @@ -1048,7 +1047,7 @@ static int sel_make_bools(void)
return ret;
err:
kfree(values);
sel_remove_bools(dir);
sel_remove_entries(dir);
ret = -ENOMEM;
goto out;
}
Expand Down

0 comments on commit 0c92d7c

Please sign in to comment.