SELinux: change sbsec->behavior to short

We only have 6 options, so char is good enough, but use a short as that
packs nicely.  This shrinks the superblock_security_struct just a little
bit.

Signed-off-by: Eric Paris <eparis@redhat.com>

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index fe99f64..b1dfe10 100644 (file)
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -58,7 +58,7 @@ 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 short behavior;        /* labeling behavior */
        unsigned short flags;           /* which mount options were specified */
        struct mutex lock;
        struct list_head isec_head;

diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index 9c424d8..20830be 100644 (file)
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -171,7 +171,7 @@ int security_get_allow_unknown(void);
 #define SECURITY_FS_USE_NONE           5 /* no labeling support */
 #define SECURITY_FS_USE_MNTPOINT       6 /* use mountpoint labeling */
 
-int security_fs_use(const char *fstype, unsigned int *behavior,
+int security_fs_use(const char *fstype, short unsigned int *behavior,
        u32 *sid);
 
 int security_genfs_sid(const char *fstype, char *name, u16 sclass,

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index b4feecc..603c638 100644 (file)
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2329,7 +2329,7 @@ out:
  */
 int security_fs_use(
        const char *fstype,
-       unsigned int *behavior,
+       short unsigned int *behavior,
        u32 *sid)
 {
        int rc = 0;