summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-29 11:51:11 +1100
committerJames Morris <jmorris@namei.org>2009-01-30 08:55:04 +1100
commitef935b9136eeaa203f75bf0b4d6e398c29f44d27 (patch)
tree22f961625dda1d64cd78f443bb7023ac16eb860d
parent5565b0b865f672e3d7e31936ad1d40710ab7bfc4 (diff)
downloadlinux-3.10-ef935b9136eeaa203f75bf0b4d6e398c29f44d27.tar.gz
linux-3.10-ef935b9136eeaa203f75bf0b4d6e398c29f44d27.tar.bz2
linux-3.10-ef935b9136eeaa203f75bf0b4d6e398c29f44d27.zip
selinux: remove secondary ops call to sb_mount
Remove secondary ops call to sb_mount, which is a noop in capabilities. Acked-by: Serge Hallyn <serue@us.ibm.com> Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--security/selinux/hooks.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 516058ff063..bdd483096b3 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2531,11 +2531,6 @@ static int selinux_mount(char *dev_name,
void *data)
{
const struct cred *cred = current_cred();
- int rc;
-
- rc = secondary_ops->sb_mount(dev_name, path, type, flags, data);
- if (rc)
- return rc;
if (flags & MS_REMOUNT)
return superblock_has_perm(cred, path->mnt->mnt_sb,