Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: one little, two little, three little whitespaces, the avc.c saga.
  SELinux: cleanup on isle selinuxfs.c
  changing whitespace for fun and profit: policydb.c
  SELinux: whitespace and formating fixes for hooks.c
  SELinux: clean up printks
  SELinux: sidtab.c whitespace, syntax, and static declaraction cleanups
  SELinux: services.c whitespace, syntax, and static declaraction cleanups
  SELinux: mls.c whitespace, syntax, and static declaraction cleanups
  SELinux: hashtab.c whitespace, syntax, and static declaraction cleanups
  SELinux: ebitmap.c whitespace, syntax, and static declaraction cleanups
  SELinux: conditional.c whitespace, syntax, and static declaraction cleanups
  SELinux: avtab.c whitespace, syntax, and static declaraction cleanups
  SELinux: xfrm.c whitespace, syntax, and static declaraction cleanups
  SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups
  SELinux: netnode.c whitespace, syntax, and static declaraction cleanups
  SELinux: netlink.c whitespace, syntax, and static declaraction cleanups
  SELinux: netlabel.c whitespace, syntax, and static declaraction cleanups
  SELinux: netif.c whitespace, syntax, and static declaraction cleanups

1 files changed, 24 insertions, 24 deletions

diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c
index 916e73a18bc5..9e6626362bfd 100644
--- a/security/selinux/ss/avtab.c
+++ b/security/selinux/ss/avtab.c
@@ -6,15 +6,15 @@
 
 /* Updated: Frank Mayer <mayerf@tresys.com> and Karl MacMillan <kmacmillan@tresys.com>
  *
- *      Added conditional policy language extensions
+ *      Added conditional policy language extensions
  *
  * Copyright (C) 2003 Tresys Technology, LLC
  *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
+ *      it under the terms of the GNU General Public License as published by
  *      the Free Software Foundation, version 2.
  *
  * Updated: Yuichi Nakamura <ynakam@hitachisoft.jp>
- *      Tuned number of hash slots for avtab to reduce memory usage
+ *      Tuned number of hash slots for avtab to reduce memory usage
  */
 
 #include <linux/kernel.h>
@@ -33,10 +33,10 @@ static inline int avtab_hash(struct avtab_key *keyp, u16 mask)
 
 static struct avtab_node*
 avtab_insert_node(struct avtab *h, int hvalue,
-                  struct avtab_node * prev, struct avtab_node * cur,
+                  struct avtab_node *prev, struct avtab_node *cur,
                   struct avtab_key *key, struct avtab_datum *datum)
 {
-        struct avtab_node * newnode;
+        struct avtab_node *newnode;
         newnode = kmem_cache_zalloc(avtab_node_cachep, GFP_KERNEL);
         if (newnode == NULL)
                 return NULL;
@@ -84,7 +84,7 @@ static int avtab_insert(struct avtab *h, struct avtab_key *key, struct avtab_dat
         }
 
         newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum);
-        if(!newnode)
+        if (!newnode)
                 return -ENOMEM;
 
         return 0;
@@ -95,7 +95,7 @@ static int avtab_insert(struct avtab *h, struct avtab_key *key, struct avtab_dat
  * It also returns a pointer to the node inserted.
  */
 struct avtab_node *
-avtab_insert_nonunique(struct avtab * h, struct avtab_key * key, struct avtab_datum * datum)
+avtab_insert_nonunique(struct avtab *h, struct avtab_key *key, struct avtab_datum *datum)
 {
         int hvalue;
         struct avtab_node *prev, *cur, *newnode;
@@ -310,8 +310,8 @@ void avtab_hash_eval(struct avtab *h, char *tag)
                 }
         }
 
-        printk(KERN_DEBUG "%s:  %d entries and %d/%d buckets used, longest "
-               "chain length %d sum of chain length^2 %Lu\n",
+        printk(KERN_DEBUG "SELinux: %s:  %d entries and %d/%d buckets used, "
+               "longest chain length %d sum of chain length^2 %Lu\n",
                tag, h->nel, slots_used, h->nslot, max_chain_len,
                chain2_len_sum);
 }
@@ -326,7 +326,7 @@ static uint16_t spec_order[] = {
 };
 
 int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
-                    int (*insertf)(struct avtab *a, struct avtab_key *k,
+                    int (*insertf)(struct avtab *a, struct avtab_key *k,
                                    struct avtab_datum *d, void *p),
                     void *p)
 {
@@ -364,19 +364,19 @@ int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
                 val = le32_to_cpu(buf32[items++]);
                 key.source_type = (u16)val;
                 if (key.source_type != val) {
-                        printk("SELinux: avtab: truncated source type\n");
+                        printk(KERN_ERR "SELinux: avtab: truncated source type\n");
                         return -1;
                 }
                 val = le32_to_cpu(buf32[items++]);
                 key.target_type = (u16)val;
                 if (key.target_type != val) {
-                        printk("SELinux: avtab: truncated target type\n");
+                        printk(KERN_ERR "SELinux: avtab: truncated target type\n");
                         return -1;
                 }
                 val = le32_to_cpu(buf32[items++]);
                 key.target_class = (u16)val;
                 if (key.target_class != val) {
-                        printk("SELinux: avtab: truncated target class\n");
+                        printk(KERN_ERR "SELinux: avtab: truncated target class\n");
                         return -1;
                 }
 
@@ -384,12 +384,12 @@ int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
                 enabled = (val & AVTAB_ENABLED_OLD) ? AVTAB_ENABLED : 0;
 
                 if (!(val & (AVTAB_AV | AVTAB_TYPE))) {
-                        printk("SELinux: avtab: null entry\n");
+                        printk(KERN_ERR "SELinux: avtab: null entry\n");
                         return -1;
                 }
                 if ((val & AVTAB_AV) &&
                     (val & AVTAB_TYPE)) {
-                        printk("SELinux: avtab: entry has both access vectors and types\n");
+                        printk(KERN_ERR "SELinux: avtab: entry has both access vectors and types\n");
                         return -1;
                 }
 
@@ -398,12 +398,13 @@ int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
                                 key.specified = spec_order[i] | enabled;
                                 datum.data = le32_to_cpu(buf32[items++]);
                                 rc = insertf(a, &key, &datum, p);
-                                if (rc) return rc;
+                                if (rc)
+                                        return rc;
                         }
                 }
 
                 if (items != items2) {
-                        printk("SELinux: avtab: entry only had %d items, expected %d\n", items2, items);
+                        printk(KERN_ERR "SELinux: avtab: entry only had %d items, expected %d\n", items2, items);
                         return -1;
                 }
                 return 0;
@@ -411,7 +412,7 @@ int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
 
         rc = next_entry(buf16, fp, sizeof(u16)*4);
         if (rc < 0) {
-                printk("SELinux: avtab: truncated entry\n");
+                printk(KERN_ERR "SELinux: avtab: truncated entry\n");
                 return -1;
         }
 
@@ -424,7 +425,7 @@ int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
         if (!policydb_type_isvalid(pol, key.source_type) ||
             !policydb_type_isvalid(pol, key.target_type) ||
             !policydb_class_isvalid(pol, key.target_class)) {
-                printk(KERN_WARNING "SELinux: avtab: invalid type or class\n");
+                printk(KERN_ERR "SELinux: avtab: invalid type or class\n");
                 return -1;
         }
 
@@ -434,20 +435,19 @@ int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
                         set++;
         }
         if (!set || set > 1) {
-                printk(KERN_WARNING
-                        "SELinux:  avtab:  more than one specifier\n");
+                printk(KERN_ERR "SELinux:  avtab:  more than one specifier\n");
                 return -1;
         }
 
         rc = next_entry(buf32, fp, sizeof(u32));
         if (rc < 0) {
-                printk("SELinux: avtab: truncated entry\n");
+                printk(KERN_ERR "SELinux: avtab: truncated entry\n");
                 return -1;
         }
         datum.data = le32_to_cpu(*buf32);
         if ((key.specified & AVTAB_TYPE) &&
             !policydb_type_isvalid(pol, datum.data)) {
-                printk(KERN_WARNING "SELinux: avtab: invalid type\n");
+                printk(KERN_ERR "SELinux: avtab: invalid type\n");
                 return -1;
         }
         return insertf(a, &key, &datum, p);
@@ -513,5 +513,5 @@ void avtab_cache_init(void)
 
 void avtab_cache_destroy(void)
 {
-        kmem_cache_destroy (avtab_node_cachep);
+        kmem_cache_destroy(avtab_node_cachep);
 }