1 files changed, 21 insertions, 27 deletions

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 89eb5621ebba..c6a1ae36952e 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -114,10 +114,8 @@ struct name_table {
 };
 
 static struct name_table table;
-static atomic_t rsv_publ_ok = ATOMIC_INIT(0);
 DEFINE_RWLOCK(tipc_nametbl_lock);
 
-
 static int hash(int x)
 {
         return x & (tipc_nametbl_size - 1);
@@ -270,6 +268,13 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
                 }
 
                 info = sseq->info;
+
+                /* Check if an identical publication already exists */
+                list_for_each_entry(publ, &info->zone_list, zone_list) {
+                        if ((publ->ref == port) && (publ->key == key) &&
+                            (!publ->node || (publ->node == node)))
+                                return NULL;
+                }
         } else {
                 u32 inspos;
                 struct sub_seq *freesseq;
@@ -534,10 +539,17 @@ struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower,
 }
 
 /*
- * tipc_nametbl_translate - translate name to port id
+ * tipc_nametbl_translate - perform name translation
+ *
+ * On entry, 'destnode' is the search domain used during translation.
  *
- * Note: on entry 'destnode' is the search domain used during translation;
- *       on exit it passes back the node address of the matching port (if any)
+ * On exit:
+ * - if name translation is deferred to another node/cluster/zone,
+ *   leaves 'destnode' unchanged (will be non-zero) and returns 0
+ * - if name translation is attempted and succeeds, sets 'destnode'
+ *   to publishing node and returns port reference (will be non-zero)
+ * - if name translation is attempted and fails, sets 'destnode' to 0
+ *   and returns 0
  */
 
 u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
@@ -547,6 +559,7 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
         struct publication *publ;
         struct name_seq *seq;
         u32 ref = 0;
+        u32 node = 0;
 
         if (!tipc_in_scope(*destnode, tipc_own_addr))
                 return 0;
@@ -604,11 +617,12 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
         }
 
         ref = publ->ref;
-        *destnode = publ->node;
+        node = publ->node;
 no_match:
         spin_unlock_bh(&seq->lock);
 not_found:
         read_unlock_bh(&tipc_nametbl_lock);
+        *destnode = node;
         return ref;
 }
 
@@ -665,22 +679,7 @@ exit:
         return res;
 }
 
-/**
- * tipc_nametbl_publish_rsv - publish port name using a reserved name type
- */
-
-int tipc_nametbl_publish_rsv(u32 ref, unsigned int scope,
-                        struct tipc_name_seq const *seq)
-{
-        int res;
-
-        atomic_inc(&rsv_publ_ok);
-        res = tipc_publish(ref, scope, seq);
-        atomic_dec(&rsv_publ_ok);
-        return res;
-}
-
-/**
+/*
  * tipc_nametbl_publish - add name publication to network name tables
  */
 
@@ -694,11 +693,6 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
                      tipc_max_publications);
                 return NULL;
         }
-        if ((type < TIPC_RESERVED_TYPES) && !atomic_read(&rsv_publ_ok)) {
-                warn("Publication failed, reserved name {%u,%u,%u}\n",
-                     type, lower, upper);
-                return NULL;
-        }
 
         write_lock_bh(&tipc_nametbl_lock);
         table.local_publ_count++;