[tipc-discussion] [PATCH v2 net-next 4/6] tipc: advance the time of calling tipc_nametbl_unsubscribe

[Ying X. <yin...@wi...>]

When subscription is inserted into subscriber->subscrp_list, the
subscription is also inserted to name sequence subscriptions list.
Now when subscription is deleted from subscriber->subscrp_list in
tipc_subscrb_subscrp_delete(), it's also a proper time to delete
the subscription from name sequence subscriptions list too.

Signed-off-by: Ying Xue <yin...@wi...>
Reviewed-by: Jon Maloy <jon...@er...>
---
 net/tipc/subscr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index ffd7b9d..6624232 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -169,7 +169,6 @@ static void tipc_subscrp_kref_release(struct kref *kref)
 	struct tipc_subscriber *subscriber = sub->subscriber;
 
 	spin_lock_bh(&subscriber->lock);
-	tipc_nametbl_unsubscribe(sub);
 	atomic_dec(&tn->subscription_count);
 	spin_unlock_bh(&subscriber->lock);
 	kfree(sub);
@@ -202,6 +201,7 @@ static void tipc_subscrb_subscrp_delete(struct tipc_subscriber *subscriber,
 
 		list_del(&sub->subscrp_list);
 
+		tipc_nametbl_unsubscribe(sub);
 		tipc_subscrp_get(sub);
 		spin_unlock_bh(&subscriber->lock);
 		tipc_subscrp_delete(sub);
-- 
2.7.4