netlabel: shorter names for the NetLabel catmap funcs/structs

Historically the NetLabel LSM secattr catmap functions and data
structures have had very long names which makes a mess of the NetLabel
code and anyone who uses NetLabel.  This patch renames the catmap
functions and structures from "*_secattr_catmap_*" to just "*_catmap_*"
which improves things greatly.

There are no substantial code or logic changes in this patch.

Signed-off-by: Paul Moore <pmoore@redhat.com>
Tested-by: Casey Schaufler <casey@schaufler-ca.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 3198cfe1dcc6..893b06b93f6d 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -777,7 +777,7 @@ static int cipso_seq_show(struct seq_file *s, void *v)
         struct list_head  *list = v;
         struct smack_known *skp =
                  list_entry(list, struct smack_known, list);
-        struct netlbl_lsm_secattr_catmap *cmp = skp->smk_netlabel.attr.mls.cat;
+        struct netlbl_lsm_catmap *cmp = skp->smk_netlabel.attr.mls.cat;
         char sep = '/';
         int i;
 
@@ -794,8 +794,8 @@ static int cipso_seq_show(struct seq_file *s, void *v)
 
         seq_printf(s, "%s %3d", skp->smk_known, skp->smk_netlabel.attr.mls.lvl);
 
-        for (i = netlbl_secattr_catmap_walk(cmp, 0); i >= 0;
-             i = netlbl_secattr_catmap_walk(cmp, i + 1)) {
+        for (i = netlbl_catmap_walk(cmp, 0); i >= 0;
+             i = netlbl_catmap_walk(cmp, i + 1)) {
                 seq_printf(s, "%c%d", sep, i);
                 sep = ',';
         }
@@ -916,7 +916,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf,
 
         rc = smk_netlbl_mls(maplevel, mapcatset, &ncats, SMK_CIPSOLEN);
         if (rc >= 0) {
-                netlbl_secattr_catmap_free(skp->smk_netlabel.attr.mls.cat);
+                netlbl_catmap_free(skp->smk_netlabel.attr.mls.cat);
                 skp->smk_netlabel.attr.mls.cat = ncats.attr.mls.cat;
                 skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl;
                 rc = count;
@@ -966,14 +966,14 @@ static int cipso2_seq_show(struct seq_file *s, void *v)
         struct list_head  *list = v;
         struct smack_known *skp =
                  list_entry(list, struct smack_known, list);
-        struct netlbl_lsm_secattr_catmap *cmp = skp->smk_netlabel.attr.mls.cat;
+        struct netlbl_lsm_catmap *cmp = skp->smk_netlabel.attr.mls.cat;
         char sep = '/';
         int i;
 
         seq_printf(s, "%s %3d", skp->smk_known, skp->smk_netlabel.attr.mls.lvl);
 
-        for (i = netlbl_secattr_catmap_walk(cmp, 0); i >= 0;
-             i = netlbl_secattr_catmap_walk(cmp, i + 1)) {
+        for (i = netlbl_catmap_walk(cmp, 0); i >= 0;
+             i = netlbl_catmap_walk(cmp, i + 1)) {
                 seq_printf(s, "%c%d", sep, i);
                 sep = ',';
         }