netlabel: cleanup struct netlbl_lsm_catmap

Simplify the code from macro NETLBL_CATMAP_MAPTYPE to u64, and fix
warning "Macros with complex values should be enclosed in parentheses"
on "#define NETLBL_CATMAP_BIT (NETLBL_CATMAP_MAPTYPE)0x01", which is
modified to "#define NETLBL_CATMAP_BIT ((u64)0x01)".

Signed-off-by: George Guo <guodongtai@kylinos.cn>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 43ae503376851c5cf4311a1461fdb530dc3ade31..f3ab0b8a4b18ad83050f562a9a560c6388bb66df 100644 (file)
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -145,15 +145,14 @@ struct netlbl_lsm_cache {
  * processing.
  *
  */
-#define NETLBL_CATMAP_MAPTYPE           u64
 #define NETLBL_CATMAP_MAPCNT            4
-#define NETLBL_CATMAP_MAPSIZE           (sizeof(NETLBL_CATMAP_MAPTYPE) * 8)
+#define NETLBL_CATMAP_MAPSIZE           (sizeof(u64) * 8)
 #define NETLBL_CATMAP_SIZE              (NETLBL_CATMAP_MAPSIZE * \
                                         NETLBL_CATMAP_MAPCNT)
-#define NETLBL_CATMAP_BIT               (NETLBL_CATMAP_MAPTYPE)0x01
+#define NETLBL_CATMAP_BIT               ((u64)0x01)
 struct netlbl_lsm_catmap {
        u32 startbit;
-       NETLBL_CATMAP_MAPTYPE bitmap[NETLBL_CATMAP_MAPCNT];
+       u64 bitmap[NETLBL_CATMAP_MAPCNT];
        struct netlbl_lsm_catmap *next;
 };
 

diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 27511c90a26f40c27de9d868c6ff268a436ac7d2..7b844581ebeea6055c99d98ada2d571b8bae222d 100644 (file)
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -610,7 +610,7 @@ int netlbl_catmap_walk(struct netlbl_lsm_catmap *catmap, u32 offset)
        struct netlbl_lsm_catmap *iter;
        u32 idx;
        u32 bit;
-       NETLBL_CATMAP_MAPTYPE bitmap;
+       u64 bitmap;
 
        iter = _netlbl_catmap_getnode(&catmap, offset, _CM_F_WALK, 0);
        if (iter == NULL)
@@ -666,8 +666,8 @@ int netlbl_catmap_walkrng(struct netlbl_lsm_catmap *catmap, u32 offset)
        struct netlbl_lsm_catmap *prev = NULL;
        u32 idx;
        u32 bit;
-       NETLBL_CATMAP_MAPTYPE bitmask;
-       NETLBL_CATMAP_MAPTYPE bitmap;
+       u64 bitmask;
+       u64 bitmap;
 
        iter = _netlbl_catmap_getnode(&catmap, offset, _CM_F_WALK, 0);
        if (iter == NULL)
@@ -857,7 +857,7 @@ int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
 
        offset -= iter->startbit;
        idx = offset / NETLBL_CATMAP_MAPSIZE;
-       iter->bitmap[idx] |= (NETLBL_CATMAP_MAPTYPE)bitmap
+       iter->bitmap[idx] |= (u64)bitmap
                             << (offset % NETLBL_CATMAP_MAPSIZE);
 
        return 0;