mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: James Morris <jmorris@namei.org>
To: Andrew Morton <akpm@osdl.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>, linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] selinuxfs cleanups - use sel_make_dir()
Date: Wed, 22 Feb 2006 09:52:21 -0500 (EST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0602220951260.30349@excalibur.intercode> (raw)
In-Reply-To: <Pine.LNX.4.64.0602220948530.30349@excalibur.intercode>

Use existing sel_make_dir() helper to create booleans directory rather 
than duplicating the logic.

Please apply.


Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>

---

security/selinux/selinuxfs.c |   12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)
  

diff -purN -X dontdiff linux-2.6.16-rc4.p/security/selinux/selinuxfs.c linux-2.6.16-rc4.w/security/selinux/selinuxfs.c
--- linux-2.6.16-rc4.p/security/selinux/selinuxfs.c	2006-02-19 20:00:31.000000000 -0500
+++ linux-2.6.16-rc4.w/security/selinux/selinuxfs.c	2006-02-21 02:24:08.000000000 -0500
@@ -1235,15 +1235,11 @@ static int sel_fill_super(struct super_b
 	dentry = d_alloc_name(sb->s_root, BOOL_DIR_NAME);
 	if (!dentry)
 		return -ENOMEM;
+	
+	ret = sel_make_dir(sb, dentry);
+	if (ret)
+		return ret;
 
-	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);
 	bool_dir = dentry;
 	ret = sel_make_bools();
 	if (ret)

  reply	other threads:[~2006-02-22 14:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-22 14:51 [PATCH 1/5] selinuxfs cleanups - fix hard link count James Morris
2006-02-22 14:52 ` James Morris [this message]
2006-02-22 14:54 ` [PATCH 3/5] selinuxfs cleanups - sel_fill_super exit path James Morris
2006-02-22 14:55 ` [PATCH 4/5] selinuxfs cleanups - sel_make_bools James Morris
2006-02-22 14:56 ` [PATCH 5/5] selinuxfs cleanups - sel_make_avc_files James Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.0602220951260.30349@excalibur.intercode \
    --to=jmorris@namei.org \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sds@tycho.nsa.gov \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®