selinux: fix style issues in security/selinux/ss/ebitmap.h

As part of on ongoing effort to perform more automated testing and
provide more tools for individual developers to validate their
patches before submitting, we are trying to make our code
"clang-format clean".  My hope is that once we have fixed all of our
style "quirks", developers will be able to run clang-format on their
patches to help avoid silly formatting problems and ensure their
changes fit in well with the rest of the SELinux kernel code.

Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/security/selinux/ss/ebitmap.h b/security/selinux/ss/ebitmap.h
index e3c807cfad90b6132483011d43af7300e41f159e..02798b35eecc06ce0622929ec550e728a566f92d 100644 (file)
--- a/security/selinux/ss/ebitmap.h
+++ b/security/selinux/ss/ebitmap.h
@@ -12,23 +12,25 @@
  *
  * Author : Stephen Smalley, <stephen.smalley.work@gmail.com>
  */
+
 #ifndef _SS_EBITMAP_H_
 #define _SS_EBITMAP_H_
 
 #include <net/netlabel.h>
 
 #ifdef CONFIG_64BIT
-#define        EBITMAP_NODE_SIZE       64
+#define EBITMAP_NODE_SIZE 64
 #else
-#define        EBITMAP_NODE_SIZE       32
+#define EBITMAP_NODE_SIZE 32
 #endif
 
-#define EBITMAP_UNIT_NUMS      ((EBITMAP_NODE_SIZE-sizeof(void *)-sizeof(u32))\
-                                       / sizeof(unsigned long))
-#define EBITMAP_UNIT_SIZE      BITS_PER_LONG
-#define EBITMAP_SIZE           (EBITMAP_UNIT_NUMS * EBITMAP_UNIT_SIZE)
-#define EBITMAP_BIT            1ULL
-#define EBITMAP_SHIFT_UNIT_SIZE(x)                                     \
+#define EBITMAP_UNIT_NUMS                                     \
+       ((EBITMAP_NODE_SIZE - sizeof(void *) - sizeof(u32)) / \
+        sizeof(unsigned long))
+#define EBITMAP_UNIT_SIZE BITS_PER_LONG
+#define EBITMAP_SIZE     (EBITMAP_UNIT_NUMS * EBITMAP_UNIT_SIZE)
+#define EBITMAP_BIT      1ULL
+#define EBITMAP_SHIFT_UNIT_SIZE(x) \
        (((x) >> EBITMAP_UNIT_SIZE / 2) >> EBITMAP_UNIT_SIZE / 2)
 
 struct ebitmap_node {
@@ -38,8 +40,8 @@ struct ebitmap_node {
 };
 
 struct ebitmap {
-       struct ebitmap_node *node;      /* first node in the bitmap */
-       u32 highbit;    /* highest position in the total bitmap */
+       struct ebitmap_node *node; /* first node in the bitmap */
+       u32 highbit; /* highest position in the total bitmap */
 };
 
 #define ebitmap_length(e) ((e)->highbit)
@@ -80,9 +82,9 @@ static inline unsigned int ebitmap_next_positive(const struct ebitmap *e,
        return ebitmap_length(e);
 }
 
-#define EBITMAP_NODE_INDEX(node, bit)  \
+#define EBITMAP_NODE_INDEX(node, bit) \
        (((bit) - (node)->startbit) / EBITMAP_UNIT_SIZE)
-#define EBITMAP_NODE_OFFSET(node, bit) \
+#define EBITMAP_NODE_OFFSET(node, bit) \
        (((bit) - (node)->startbit) % EBITMAP_UNIT_SIZE)
 
 static inline int ebitmap_node_get_bit(const struct ebitmap_node *n,
@@ -117,15 +119,17 @@ static inline void ebitmap_node_clr_bit(struct ebitmap_node *n,
        n->maps[index] &= ~(EBITMAP_BIT << ofs);
 }
 
-#define ebitmap_for_each_positive_bit(e, n, bit)       \
-       for ((bit) = ebitmap_start_positive(e, &(n));   \
-            (bit) < ebitmap_length(e);                 \
-            (bit) = ebitmap_next_positive(e, &(n), bit))       \
+#define ebitmap_for_each_positive_bit(e, n, bit)      \
+       for ((bit) = ebitmap_start_positive(e, &(n)); \
+            (bit) < ebitmap_length(e);               \
+            (bit) = ebitmap_next_positive(e, &(n), bit))
 
 int ebitmap_cmp(const struct ebitmap *e1, const struct ebitmap *e2);
 int ebitmap_cpy(struct ebitmap *dst, const struct ebitmap *src);
-int ebitmap_and(struct ebitmap *dst, const struct ebitmap *e1, const struct ebitmap *e2);
-int ebitmap_contains(const struct ebitmap *e1, const struct ebitmap *e2, u32 last_e2bit);
+int ebitmap_and(struct ebitmap *dst, const struct ebitmap *e1,
+               const struct ebitmap *e2);
+int ebitmap_contains(const struct ebitmap *e1, const struct ebitmap *e2,
+                    u32 last_e2bit);
 int ebitmap_get_bit(const struct ebitmap *e, unsigned long bit);
 int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value);
 void ebitmap_destroy(struct ebitmap *e);
@@ -151,4 +155,4 @@ static inline int ebitmap_netlbl_import(struct ebitmap *ebmap,
 }
 #endif
 
-#endif /* _SS_EBITMAP_H_ */
+#endif /* _SS_EBITMAP_H_ */