netlabel: shorter names for the NetLabel catmap funcs/structs

[sfrench/cifs-2.6.git] / net / ipv4 / cipso_ipv4.c

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 69e77c8ff285c74a3743cd10b95cfd04a45bf687..05b708bbdb0dedd34a04d99b16391a6b2ca4a30c 100644 (file)
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -890,8 +890,8 @@ static int cipso_v4_map_cat_rbm_hton(const struct cipso_v4_doi *doi_def,
        }
 
        for (;;) {
-               host_spot = netlbl_secattr_catmap_walk(secattr->attr.mls.cat,
-                                                      host_spot + 1);
+               host_spot = netlbl_catmap_walk(secattr->attr.mls.cat,
+                                              host_spot + 1);
                if (host_spot < 0)
                        break;
 
@@ -973,7 +973,7 @@ static int cipso_v4_map_cat_rbm_ntoh(const struct cipso_v4_doi *doi_def,
                                return -EPERM;
                        break;
                }
-               ret_val = netlbl_secattr_catmap_setbit(secattr->attr.mls.cat,
+               ret_val = netlbl_catmap_setbit(&secattr->attr.mls.cat,
                                                       host_spot,
                                                       GFP_ATOMIC);
                if (ret_val != 0)
@@ -1039,8 +1039,7 @@ static int cipso_v4_map_cat_enum_hton(const struct cipso_v4_doi *doi_def,
        u32 cat_iter = 0;
 
        for (;;) {
-               cat = netlbl_secattr_catmap_walk(secattr->attr.mls.cat,
-                                                cat + 1);
+               cat = netlbl_catmap_walk(secattr->attr.mls.cat, cat + 1);
                if (cat < 0)
                        break;
                if ((cat_iter + 2) > net_cat_len)
@@ -1075,9 +1074,9 @@ static int cipso_v4_map_cat_enum_ntoh(const struct cipso_v4_doi *doi_def,
        u32 iter;
 
        for (iter = 0; iter < net_cat_len; iter += 2) {
-               ret_val = netlbl_secattr_catmap_setbit(secattr->attr.mls.cat,
-                               get_unaligned_be16(&net_cat[iter]),
-                               GFP_ATOMIC);
+               ret_val = netlbl_catmap_setbit(&secattr->attr.mls.cat,
+                                            get_unaligned_be16(&net_cat[iter]),
+                                            GFP_ATOMIC);
                if (ret_val != 0)
                        return ret_val;
        }
@@ -1155,8 +1154,7 @@ static int cipso_v4_map_cat_rng_hton(const struct cipso_v4_doi *doi_def,
                return -ENOSPC;
 
        for (;;) {
-               iter = netlbl_secattr_catmap_walk(secattr->attr.mls.cat,
-                                                 iter + 1);
+               iter = netlbl_catmap_walk(secattr->attr.mls.cat, iter + 1);
                if (iter < 0)
                        break;
                cat_size += (iter == 0 ? 0 : sizeof(u16));
@@ -1164,8 +1162,7 @@ static int cipso_v4_map_cat_rng_hton(const struct cipso_v4_doi *doi_def,
                        return -ENOSPC;
                array[array_cnt++] = iter;
 
-               iter = netlbl_secattr_catmap_walk_rng(secattr->attr.mls.cat,
-                                                     iter);
+               iter = netlbl_catmap_walkrng(secattr->attr.mls.cat, iter);
                if (iter < 0)
                        return -EFAULT;
                cat_size += sizeof(u16);
@@ -1217,10 +1214,10 @@ static int cipso_v4_map_cat_rng_ntoh(const struct cipso_v4_doi *doi_def,
                else
                        cat_low = 0;
 
-               ret_val = netlbl_secattr_catmap_setrng(secattr->attr.mls.cat,
-                                                      cat_low,
-                                                      cat_high,
-                                                      GFP_ATOMIC);
+               ret_val = netlbl_catmap_setrng(&secattr->attr.mls.cat,
+                                              cat_low,
+                                              cat_high,
+                                              GFP_ATOMIC);
                if (ret_val != 0)
                        return ret_val;
        }
@@ -1335,16 +1332,12 @@ static int cipso_v4_parsetag_rbm(const struct cipso_v4_doi *doi_def,
        secattr->flags |= NETLBL_SECATTR_MLS_LVL;
 
        if (tag_len > 4) {
-               secattr->attr.mls.cat = netlbl_secattr_catmap_alloc(GFP_ATOMIC);
-               if (secattr->attr.mls.cat == NULL)
-                       return -ENOMEM;
-
                ret_val = cipso_v4_map_cat_rbm_ntoh(doi_def,
                                                    &tag[4],
                                                    tag_len - 4,
                                                    secattr);
                if (ret_val != 0) {
-                       netlbl_secattr_catmap_free(secattr->attr.mls.cat);
+                       netlbl_catmap_free(secattr->attr.mls.cat);
                        return ret_val;
                }
 
@@ -1430,16 +1423,12 @@ static int cipso_v4_parsetag_enum(const struct cipso_v4_doi *doi_def,
        secattr->flags |= NETLBL_SECATTR_MLS_LVL;
 
        if (tag_len > 4) {
-               secattr->attr.mls.cat = netlbl_secattr_catmap_alloc(GFP_ATOMIC);
-               if (secattr->attr.mls.cat == NULL)
-                       return -ENOMEM;
-
                ret_val = cipso_v4_map_cat_enum_ntoh(doi_def,
                                                     &tag[4],
                                                     tag_len - 4,
                                                     secattr);
                if (ret_val != 0) {
-                       netlbl_secattr_catmap_free(secattr->attr.mls.cat);
+                       netlbl_catmap_free(secattr->attr.mls.cat);
                        return ret_val;
                }
 
@@ -1524,16 +1513,12 @@ static int cipso_v4_parsetag_rng(const struct cipso_v4_doi *doi_def,
        secattr->flags |= NETLBL_SECATTR_MLS_LVL;
 
        if (tag_len > 4) {
-               secattr->attr.mls.cat = netlbl_secattr_catmap_alloc(GFP_ATOMIC);
-               if (secattr->attr.mls.cat == NULL)
-                       return -ENOMEM;
-
                ret_val = cipso_v4_map_cat_rng_ntoh(doi_def,
                                                    &tag[4],
                                                    tag_len - 4,
                                                    secattr);
                if (ret_val != 0) {
-                       netlbl_secattr_catmap_free(secattr->attr.mls.cat);
+                       netlbl_catmap_free(secattr->attr.mls.cat);
                        return ret_val;
                }