SELinux: keep the code clean formating and syntax

Formatting and syntax changes

whitespace, tabs to spaces, trailing space
put open { on same line as struct def
remove unneeded {} after if statements
change printk("Lu") to printk("llu")
convert asm/uaccess.h to linux/uaacess.h includes
remove unnecessary asm/bug.h includes
convert all users of simple_strtol to strict_strtol

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>

3 files changed, 7 insertions, 7 deletions

diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c
index 9e6626362bfd..a1be97f8beea 100644
--- a/security/selinux/ss/avtab.c
+++ b/security/selinux/ss/avtab.c
@@ -311,7 +311,7 @@ void avtab_hash_eval(struct avtab *h, char *tag)
         }
 
         printk(KERN_DEBUG "SELinux: %s:  %d entries and %d/%d buckets used, "
-               "longest chain length %d sum of chain length^2 %Lu\n",
+               "longest chain length %d sum of chain length^2 %llu\n",
                tag, h->nel, slots_used, h->nslot, max_chain_len,
                chain2_len_sum);
 }
diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c
index a6ca0587e634..77d745da48bb 100644
--- a/security/selinux/ss/mls.c
+++ b/security/selinux/ss/mls.c
@@ -437,13 +437,13 @@ int mls_setup_user_range(struct context *fromcon, struct user_datum *user,
                 struct mls_level *usercon_clr = &(usercon->range.level[1]);
 
                 /* Honor the user's default level if we can */
-                if (mls_level_between(user_def, fromcon_sen, fromcon_clr)) {
+                if (mls_level_between(user_def, fromcon_sen, fromcon_clr))
                         *usercon_sen = *user_def;
-                } else if (mls_level_between(fromcon_sen, user_def, user_clr)) {
+                else if (mls_level_between(fromcon_sen, user_def, user_clr))
                         *usercon_sen = *fromcon_sen;
-                } else if (mls_level_between(fromcon_clr, user_low, user_def)) {
+                else if (mls_level_between(fromcon_clr, user_low, user_def))
                         *usercon_sen = *user_low;
-                } else
+                else
                         return -EINVAL;
 
                 /* Lower the clearance of available contexts
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 2d5e5a3a8aa9..0696aadcab6f 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2531,7 +2531,7 @@ int selinux_audit_rule_known(struct audit_krule *rule)
 }
 
 int selinux_audit_rule_match(u32 sid, u32 field, u32 op, void *vrule,
-                             struct audit_context *actx)
+                             struct audit_context *actx)
 {
         struct context *ctxt;
         struct mls_level *level;
@@ -2645,7 +2645,7 @@ out:
 static int (*aurule_callback)(void) = audit_update_lsm_rules;
 
 static int aurule_avc_callback(u32 event, u32 ssid, u32 tsid,
-                               u16 class, u32 perms, u32 *retained)
+                               u16 class, u32 perms, u32 *retained)
 {
         int err = 0;