tipc: some prefix changes

Since we now have removed struct tipc_subscriber from the code, and
only struct tipc_subscription remains, there is no longer need for long
and awkward prefixes to distinguish between their pertaining functions.

We now change all tipc_subscrp_* prefixes to tipc_sub_*. This is
a purely cosmetic change.

Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 54 insertions, 56 deletions

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 2fbd0a20a958..b234b7ee0b84 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -326,10 +326,10 @@ static struct publication *tipc_nameseq_insert_publ(struct net *net,
 
         /* Any subscriptions waiting for notification?  */
         list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) {
-                tipc_subscrp_report_overlap(s, publ->lower, publ->upper,
-                                            TIPC_PUBLISHED, publ->ref,
-                                            publ->node, publ->scope,
-                                            created_subseq);
+                tipc_sub_report_overlap(s, publ->lower, publ->upper,
+                                        TIPC_PUBLISHED, publ->ref,
+                                        publ->node, publ->scope,
+                                        created_subseq);
         }
         return publ;
 }
@@ -397,10 +397,9 @@ found:
 
         /* Notify any waiting subscriptions */
         list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) {
-                tipc_subscrp_report_overlap(s, publ->lower, publ->upper,
-                                            TIPC_WITHDRAWN, publ->ref,
-                                            publ->node, publ->scope,
-                                            removed_subseq);
+                tipc_sub_report_overlap(s, publ->lower, publ->upper,
+                                        TIPC_WITHDRAWN, publ->ref, publ->node,
+                                        publ->scope, removed_subseq);
         }
 
         return publ;
@@ -424,25 +423,25 @@ static void tipc_nameseq_subscribe(struct name_seq *nseq,
         ns.upper = tipc_sub_read(s, seq.upper);
         no_status = tipc_sub_read(s, filter) & TIPC_SUB_NO_STATUS;
 
-        tipc_subscrp_get(sub);
+        tipc_sub_get(sub);
         list_add(&sub->nameseq_list, &nseq->subscriptions);
 
         if (no_status || !sseq)
                 return;
 
         while (sseq != &nseq->sseqs[nseq->first_free]) {
-                if (tipc_subscrp_check_overlap(&ns, sseq->lower, sseq->upper)) {
+                if (tipc_sub_check_overlap(&ns, sseq->lower, sseq->upper)) {
                         struct publication *crs;
                         struct name_info *info = sseq->info;
                         int must_report = 1;
 
                         list_for_each_entry(crs, &info->zone_list, zone_list) {
-                                tipc_subscrp_report_overlap(sub, sseq->lower,
-                                                            sseq->upper,
-                                                            TIPC_PUBLISHED,
-                                                            crs->ref, crs->node,
-                                                            crs->scope,
-                                                            must_report);
+                                tipc_sub_report_overlap(sub, sseq->lower,
+                                                        sseq->upper,
+                                                        TIPC_PUBLISHED,
+                                                        crs->ref, crs->node,
+                                                        crs->scope,
+                                                        must_report);
                                 must_report = 0;
                         }
                 }
@@ -856,7 +855,7 @@ void tipc_nametbl_unsubscribe(struct tipc_subscription *sub)
         if (seq != NULL) {
                 spin_lock_bh(&seq->lock);
                 list_del_init(&sub->nameseq_list);
-                tipc_subscrp_put(sub);
+                tipc_sub_put(sub);
                 if (!seq->first_free && list_empty(&seq->subscriptions)) {
                         hlist_del_init_rcu(&seq->ns_list);
                         kfree(seq->sseqs);
diff --git a/net/tipc/server.c b/net/tipc/server.c
index 6a18b10ac271..a5c112ed3bbe 100644
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -201,7 +201,7 @@ static void tipc_con_delete_sub(struct tipc_conn *con, struct tipc_subscr *s)
         struct tipc_subscription *sub, *tmp;
 
         spin_lock_bh(&con->sub_lock);
-        list_for_each_entry_safe(sub, tmp, sub_list, subscrp_list) {
+        list_for_each_entry_safe(sub, tmp, sub_list, sub_list) {
                 if (!s || !memcmp(s, &sub->evt.s, sizeof(*s)))
                         tipc_sub_unsubscribe(sub);
                 else if (s)
@@ -281,9 +281,8 @@ static int tipc_con_rcv_sub(struct tipc_server *srv,
         sub = tipc_sub_subscribe(srv, s, con->conid);
         if (!sub)
                 return -1;
-
         spin_lock_bh(&con->sub_lock);
-        list_add(&sub->subscrp_list, &con->sub_list);
+        list_add(&sub->sub_list, &con->sub_list);
         spin_unlock_bh(&con->sub_lock);
         return 0;
 }
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 8d37b61e3163..3be1e4b6cbfa 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -38,9 +38,9 @@
 #include "name_table.h"
 #include "subscr.h"
 
-static void tipc_subscrp_send_event(struct tipc_subscription *sub,
-                                    u32 found_lower, u32 found_upper,
-                                    u32 event, u32 port, u32 node)
+static void tipc_sub_send_event(struct tipc_subscription *sub,
+                                u32 found_lower, u32 found_upper,
+                                u32 event, u32 port, u32 node)
 {
         struct tipc_event *evt = &sub->evt;
 
@@ -55,13 +55,13 @@ static void tipc_subscrp_send_event(struct tipc_subscription *sub,
 }
 
 /**
- * tipc_subscrp_check_overlap - test for subscription overlap with the
+ * tipc_sub_check_overlap - test for subscription overlap with the
  * given values
  *
  * Returns 1 if there is overlap, otherwise 0.
  */
-int tipc_subscrp_check_overlap(struct tipc_name_seq *seq, u32 found_lower,
-                               u32 found_upper)
+int tipc_sub_check_overlap(struct tipc_name_seq *seq, u32 found_lower,
+                           u32 found_upper)
 {
         if (found_lower < seq->lower)
                 found_lower = seq->lower;
@@ -72,20 +72,20 @@ int tipc_subscrp_check_overlap(struct tipc_name_seq *seq, u32 found_lower,
         return 1;
 }
 
-void tipc_subscrp_report_overlap(struct tipc_subscription *sub,
-                                 u32 found_lower, u32 found_upper,
-                                 u32 event, u32 port, u32 node,
-                                 u32 scope, int must)
+void tipc_sub_report_overlap(struct tipc_subscription *sub,
+                             u32 found_lower, u32 found_upper,
+                             u32 event, u32 port, u32 node,
+                             u32 scope, int must)
 {
-        struct tipc_name_seq seq;
         struct tipc_subscr *s = &sub->evt.s;
         u32 filter = tipc_sub_read(s, filter);
+        struct tipc_name_seq seq;
 
         seq.type = tipc_sub_read(s, seq.type);
         seq.lower = tipc_sub_read(s, seq.lower);
         seq.upper = tipc_sub_read(s, seq.upper);
 
-        if (!tipc_subscrp_check_overlap(&seq, found_lower, found_upper))
+        if (!tipc_sub_check_overlap(&seq, found_lower, found_upper))
                 return;
 
         if (!must && !(filter & TIPC_SUB_PORTS))
@@ -95,24 +95,24 @@ void tipc_subscrp_report_overlap(struct tipc_subscription *sub,
         if (filter & TIPC_SUB_NODE_SCOPE && scope != TIPC_NODE_SCOPE)
                 return;
         spin_lock(&sub->lock);
-        tipc_subscrp_send_event(sub, found_lower, found_upper,
-                                event, port, node);
+        tipc_sub_send_event(sub, found_lower, found_upper,
+                            event, port, node);
         spin_unlock(&sub->lock);
 }
 
-static void tipc_subscrp_timeout(struct timer_list *t)
+static void tipc_sub_timeout(struct timer_list *t)
 {
         struct tipc_subscription *sub = from_timer(sub, t, timer);
         struct tipc_subscr *s = &sub->evt.s;
 
         spin_lock(&sub->lock);
-        tipc_subscrp_send_event(sub, s->seq.lower, s->seq.upper,
-                                TIPC_SUBSCR_TIMEOUT, 0, 0);
+        tipc_sub_send_event(sub, s->seq.lower, s->seq.upper,
+                            TIPC_SUBSCR_TIMEOUT, 0, 0);
         sub->inactive = true;
         spin_unlock(&sub->lock);
 }
 
-static void tipc_subscrp_kref_release(struct kref *kref)
+static void tipc_sub_kref_release(struct kref *kref)
 {
         struct tipc_subscription *sub;
         struct tipc_net *tn;
@@ -124,12 +124,12 @@ static void tipc_subscrp_kref_release(struct kref *kref)
         kfree(sub);
 }
 
-void tipc_subscrp_put(struct tipc_subscription *subscription)
+void tipc_sub_put(struct tipc_subscription *subscription)
 {
-        kref_put(&subscription->kref, tipc_subscrp_kref_release);
+        kref_put(&subscription->kref, tipc_sub_kref_release);
 }
 
-void tipc_subscrp_get(struct tipc_subscription *subscription)
+void tipc_sub_get(struct tipc_subscription *subscription)
 {
         kref_get(&subscription->kref);
 }
@@ -139,8 +139,8 @@ struct tipc_subscription *tipc_sub_subscribe(struct tipc_server *srv,
                                              int conid)
 {
         struct tipc_net *tn = tipc_net(srv->net);
-        struct tipc_subscription *sub;
         u32 filter = tipc_sub_read(s, filter);
+        struct tipc_subscription *sub;
         u32 timeout;
 
         if (atomic_read(&tn->subscription_count) >= TIPC_MAX_SUBSCR) {
@@ -165,7 +165,7 @@ struct tipc_subscription *tipc_sub_subscribe(struct tipc_server *srv,
         atomic_inc(&tn->subscription_count);
         kref_init(&sub->kref);
         tipc_nametbl_subscribe(sub);
-        timer_setup(&sub->timer, tipc_subscrp_timeout, 0);
+        timer_setup(&sub->timer, tipc_sub_timeout, 0);
         timeout = tipc_sub_read(&sub->evt.s, timeout);
         if (timeout != TIPC_WAIT_FOREVER)
                 mod_timer(&sub->timer, jiffies + msecs_to_jiffies(timeout));
@@ -177,16 +177,16 @@ void tipc_sub_unsubscribe(struct tipc_subscription *sub)
         tipc_nametbl_unsubscribe(sub);
         if (sub->evt.s.timeout != TIPC_WAIT_FOREVER)
                 del_timer_sync(&sub->timer);
-        list_del(&sub->subscrp_list);
-        tipc_subscrp_put(sub);
+        list_del(&sub->sub_list);
+        tipc_sub_put(sub);
 }
 
 int tipc_topsrv_start(struct net *net)
 {
         struct tipc_net *tn = net_generic(net, tipc_net_id);
         const char name[] = "topology_server";
-        struct tipc_server *topsrv;
         struct sockaddr_tipc *saddr;
+        struct tipc_server *topsrv;
 
         saddr = kzalloc(sizeof(*saddr), GFP_ATOMIC);
         if (!saddr)
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h
index 2d35f1046754..720932896ba6 100644
--- a/net/tipc/subscr.h
+++ b/net/tipc/subscr.h
@@ -51,7 +51,7 @@ struct tipc_conn;
  * @seq: name sequence associated with subscription
  * @timer: timer governing subscription duration (optional)
  * @nameseq_list: adjacent subscriptions in name sequence's subscription list
- * @subscrp_list: adjacent subscriptions in subscriber's subscription list
+ * @sub_list: adjacent subscriptions in subscriber's subscription list
  * @evt: template for events generated by subscription
  */
 struct tipc_subscription {
@@ -59,7 +59,7 @@ struct tipc_subscription {
         struct tipc_server *server;
         struct timer_list timer;
         struct list_head nameseq_list;
-        struct list_head subscrp_list;
+        struct list_head sub_list;
         struct tipc_event evt;
         int conid;
         bool inactive;
@@ -71,17 +71,17 @@ struct tipc_subscription *tipc_sub_subscribe(struct tipc_server *srv,
                                              int conid);
 void tipc_sub_unsubscribe(struct tipc_subscription *sub);
 
-int tipc_subscrp_check_overlap(struct tipc_name_seq *seq, u32 found_lower,
-                               u32 found_upper);
-void tipc_subscrp_report_overlap(struct tipc_subscription *sub,
-                                 u32 found_lower, u32 found_upper,
-                                 u32 event, u32 port, u32 node,
-                                 u32 scope, int must);
+int tipc_sub_check_overlap(struct tipc_name_seq *seq, u32 found_lower,
+                           u32 found_upper);
+void tipc_sub_report_overlap(struct tipc_subscription *sub,
+                             u32 found_lower, u32 found_upper,
+                             u32 event, u32 port, u32 node,
+                             u32 scope, int must);
 int tipc_topsrv_start(struct net *net);
 void tipc_topsrv_stop(struct net *net);
 
-void tipc_subscrp_put(struct tipc_subscription *subscription);
-void tipc_subscrp_get(struct tipc_subscription *subscription);
+void tipc_sub_put(struct tipc_subscription *subscription);
+void tipc_sub_get(struct tipc_subscription *subscription);
 
 #define TIPC_FILTER_MASK (TIPC_SUB_PORTS | TIPC_SUB_SERVICE | TIPC_SUB_CANCEL)