diff options
Diffstat (limited to 'security/selinux/include')
-rw-r--r-- | security/selinux/include/objsec.h | 2 | ||||
-rw-r--r-- | security/selinux/include/security.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index fe99f64a1d54..b1dfe1049450 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h | |||
@@ -58,7 +58,7 @@ struct superblock_security_struct { | |||
58 | u32 sid; /* SID of file system superblock */ | 58 | u32 sid; /* SID of file system superblock */ |
59 | u32 def_sid; /* default SID for labeling */ | 59 | u32 def_sid; /* default SID for labeling */ |
60 | u32 mntpoint_sid; /* SECURITY_FS_USE_MNTPOINT context for files */ | 60 | u32 mntpoint_sid; /* SECURITY_FS_USE_MNTPOINT context for files */ |
61 | unsigned int behavior; /* labeling behavior */ | 61 | unsigned short behavior; /* labeling behavior */ |
62 | unsigned short flags; /* which mount options were specified */ | 62 | unsigned short flags; /* which mount options were specified */ |
63 | struct mutex lock; | 63 | struct mutex lock; |
64 | struct list_head isec_head; | 64 | struct list_head isec_head; |
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 9c424d8bd2e0..20830be6b61f 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h | |||
@@ -171,7 +171,7 @@ int security_get_allow_unknown(void); | |||
171 | #define SECURITY_FS_USE_NONE 5 /* no labeling support */ | 171 | #define SECURITY_FS_USE_NONE 5 /* no labeling support */ |
172 | #define SECURITY_FS_USE_MNTPOINT 6 /* use mountpoint labeling */ | 172 | #define SECURITY_FS_USE_MNTPOINT 6 /* use mountpoint labeling */ |
173 | 173 | ||
174 | int security_fs_use(const char *fstype, unsigned int *behavior, | 174 | int security_fs_use(const char *fstype, short unsigned int *behavior, |
175 | u32 *sid); | 175 | u32 *sid); |
176 | 176 | ||
177 | int security_genfs_sid(const char *fstype, char *name, u16 sclass, | 177 | int security_genfs_sid(const char *fstype, char *name, u16 sclass, |