From ae0a16f5f7db403983555daa706f7b7dbdc52304 Mon Sep 17 00:00:00 2001 From: James Morris Date: Wed, 22 Mar 2006 00:09:17 -0800 Subject: [PATCH] --- yaml --- r: 22510 b: refs/heads/master c: cde174a885821b5eee7e00c8a9a426c9c8186a29 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/selinuxfs.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index e604d4c0c43a..4462c80b1f7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40e906f8224966ef65756cc75f9999ea2de0523d +refs/heads/master: cde174a885821b5eee7e00c8a9a426c9c8186a29 diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c index 4f7cda67ac0a..f898080b9493 100644 --- a/trunk/security/selinux/selinuxfs.c +++ b/trunk/security/selinux/selinuxfs.c @@ -1219,14 +1219,10 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent) if (!dentry) return -ENOMEM; - inode = sel_make_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); - if (!inode) - goto out; - inode->i_op = &simple_dir_inode_operations; - inode->i_fop = &simple_dir_operations; - /* directory inodes start off with i_nlink == 2 (for "." entry) */ - inode->i_nlink++; - d_add(dentry, inode); + ret = sel_make_dir(sb, dentry); + if (ret) + return ret; + bool_dir = dentry; ret = sel_make_bools(); if (ret)