Эх сурвалжийг харах

tipc: Eliminate checks for empty zone list during name translation

Gets rid of a pair of checks to see if a name sequence entry in
TIPC's name table has an empty zone list. These checks are pointless
since the zone list can never be empty (i.e. as soon as the list
becomes empty the associated name sequence entry is deleted).

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Allan Stephens 14 жил өмнө
parent
commit
8af4638a29

+ 2 - 5
net/tipc/name_table.c

@@ -574,14 +574,13 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
 						cluster_list);
 						cluster_list);
 			list_move_tail(&publ->cluster_list,
 			list_move_tail(&publ->cluster_list,
 				       &info->cluster_list);
 				       &info->cluster_list);
-		} else if (!list_empty(&info->zone_list)) {
+		} else {
 			publ = list_first_entry(&info->zone_list,
 			publ = list_first_entry(&info->zone_list,
 						struct publication,
 						struct publication,
 						zone_list);
 						zone_list);
 			list_move_tail(&publ->zone_list,
 			list_move_tail(&publ->zone_list,
 				       &info->zone_list);
 				       &info->zone_list);
-		} else
-			goto no_match;
+		}
 	}
 	}
 
 
 	/* Round-Robin Algorithm: */
 	/* Round-Robin Algorithm: */
@@ -598,8 +597,6 @@ u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
 					cluster_list);
 					cluster_list);
 		list_move_tail(&publ->cluster_list, &info->cluster_list);
 		list_move_tail(&publ->cluster_list, &info->cluster_list);
 	} else {
 	} else {
-		if (list_empty(&info->zone_list))
-			goto no_match;
 		publ = list_first_entry(&info->zone_list, struct publication,
 		publ = list_first_entry(&info->zone_list, struct publication,
 					zone_list);
 					zone_list);
 		list_move_tail(&publ->zone_list, &info->zone_list);
 		list_move_tail(&publ->zone_list, &info->zone_list);