From 7f03ccb14fc69f40d30b137949d165e9e21e180b Mon Sep 17 00:00:00 2001 From: "Christopher J. PeBenito" Date: Wed, 23 May 2007 09:12:07 -0400 Subject: [PATCH] --- yaml --- r: 59215 b: refs/heads/master c: 0c92d7c73b6f99897c8bc7990717b9050cfc722f h: refs/heads/master i: 59213: ec99a45c5648bf8fa2e85ac579497810657f8a8e 59211: 6b291ea60017c54d45035fb591dbbf35928d78c9 59207: a1fe5e08a4f14ab974b79a6a7366477904532d5c 59199: 3e51da3cdfc763daeebe02ec979b6d4daf8de8ae v: v3 --- [refs] | 2 +- trunk/security/selinux/selinuxfs.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index eb73082ef02f..ba1ed34a15df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55fcf09b3fe4325c9395ebbb0322a547a157ebc7 +refs/heads/master: 0c92d7c73b6f99897c8bc7990717b9050cfc722f diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c index aca099aa2ed3..e9552462d16b 100644 --- a/trunk/security/selinux/selinuxfs.c +++ b/trunk/security/selinux/selinuxfs.c @@ -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; @@ -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; @@ -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; }