diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-10-22 15:26:41 +0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-10-22 15:26:41 +0400 |
| commit | 6f799c97f37fc0ee2c9c427fa0dada637394886c (patch) | |
| tree | 1953a953770b8047a95ef4d431bb693433922043 /security/selinux/include/objsec.h | |
| parent | eb8948a03704f3dbbfc7e83090e20e93c6c476d2 (diff) | |
| parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
| download | linux-6f799c97f37fc0ee2c9c427fa0dada637394886c.tar.xz | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
Diffstat (limited to 'security/selinux/include/objsec.h')
| -rw-r--r-- | security/selinux/include/objsec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index aa47bcabb5f6..b1dfe1049450 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h @@ -58,8 +58,8 @@ struct superblock_security_struct { u32 sid; /* SID of file system superblock */ 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 behavior; /* labeling behavior */ + unsigned short flags; /* which mount options were specified */ struct mutex lock; struct list_head isec_head; spinlock_t isec_lock; |