Revert "SELinux: build fix for 4.1"

This reverts commit 43e1b4f528.

This patch is part of code which is already upstreamed in v4.4. Commits
5c73fceb8c (SELinux: Enable setting security contexts on rootfs inodes.),
12f348b9dc (SELinux: rename SE_SBLABELSUPP to SBLABEL_MNT), and
b43e725d8d (SELinux: use a helper function to determine seclabel).
for reference.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
This commit is contained in:
Amit Pundir 2016-04-26 15:51:06 +05:30
parent 28813390bf
commit e7d7e51782

View file

@ -469,7 +469,7 @@ static int sb_finish_set_opts(struct super_block *sb)
* setting SELinux context on in-core inodes. * setting SELinux context on in-core inodes.
*/ */
if (strncmp(sb->s_type->name, "rootfs", sizeof("rootfs")) == 0) if (strncmp(sb->s_type->name, "rootfs", sizeof("rootfs")) == 0)
sbsec->flags |= SBLABEL_MNT; sbsec->flags |= SE_SBLABELSUPP;
/* Initialize the root inode. */ /* Initialize the root inode. */
rc = inode_doinit_with_dentry(root_inode, root); rc = inode_doinit_with_dentry(root_inode, root);