aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/include/objsec.h
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-10-09 16:20:08 -0400
committerEric Paris <eparis@redhat.com>2013-07-25 13:03:06 -0400
commitcfca0303da0e2c3f570cb5cfc7c373828e6c13a2 (patch)
tree205d93f1d114c1c91e3640cb16720dbc5e6c1288 /security/selinux/include/objsec.h
parentSELinux: do all flags twiddling in one place (diff)
downloadlinux-dev-cfca0303da0e2c3f570cb5cfc7c373828e6c13a2.tar.xz
linux-dev-cfca0303da0e2c3f570cb5cfc7c373828e6c13a2.zip
SELinux: renumber the superblock options
Just to make it clear that we have mount time options and flags, separate them. Since I decided to move the non-mount options above above 0x10, we need a short instead of a char. (x86 padding says this takes up no additional space as we have a 3byte whole in the structure) Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'security/selinux/include/objsec.h')
-rw-r--r--security/selinux/include/objsec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index aa47bcabb5f6..fe99f64a1d54 100644
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -59,7 +59,7 @@ struct superblock_security_struct {
u32 def_sid; /* default SID for labeling */
u32 mntpoint_sid; /* SECURITY_FS_USE_MNTPOINT context for files */
unsigned int behavior; /* labeling behavior */
- unsigned char flags; /* which mount options were specified */
+ unsigned short flags; /* which mount options were specified */
struct mutex lock;
struct list_head isec_head;
spinlock_t isec_lock;