Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7fb9d20 authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: Create helper routine to delete unused name sequence structure 



Replaces two identical chunks of code that delete an unused name
sequence structure from TIPC's name table with calls to a new routine
that performs this operation.

This change is cosmetic and doesn't impact the operation of TIPC.

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent bbe6a295

net/tipc/name_table.c

+15 −12
Original line number Original line Diff line number Diff line
@@ -186,7 +186,19 @@ static struct name_seq *tipc_nameseq_create(u32 type, struct hlist_head *seq_hea 
	return nseq;

	return nseq;

}

}





/**

/*

 * nameseq_delete_empty - deletes a name sequence structure if now unused

 */

static void nameseq_delete_empty(struct name_seq *seq)

{

	if (!seq->first_free && list_empty(&seq->subscriptions)) {

		hlist_del_init(&seq->ns_list);

		kfree(seq->sseqs);

		kfree(seq);

	}

}



/*

 * nameseq_find_subseq - find sub-sequence (if any) matching a name instance

 * nameseq_find_subseq - find sub-sequence (if any) matching a name instance

 *

 *

 * Very time-critical, so binary searches through sub-sequence array.

 * Very time-critical, so binary searches through sub-sequence array.
@@ -529,12 +541,7 @@ struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower, 
		return NULL;

		return NULL;





	publ = tipc_nameseq_remove_publ(seq, lower, node, ref, key);

	publ = tipc_nameseq_remove_publ(seq, lower, node, ref, key);



	nameseq_delete_empty(seq);

	if (!seq->first_free && list_empty(&seq->subscriptions)) {

		hlist_del_init(&seq->ns_list);

		kfree(seq->sseqs);

		kfree(seq);

	}

	return publ;

	return publ;

}

}
@@ -768,11 +775,7 @@ void tipc_nametbl_unsubscribe(struct tipc_subscription *s) 
		spin_lock_bh(&seq->lock);

		spin_lock_bh(&seq->lock);

		list_del_init(&s->nameseq_list);

		list_del_init(&s->nameseq_list);

		spin_unlock_bh(&seq->lock);

		spin_unlock_bh(&seq->lock);

		if ((seq->first_free == 0) && list_empty(&seq->subscriptions)) {

		nameseq_delete_empty(seq);

			hlist_del_init(&seq->ns_list);

			kfree(seq->sseqs);

			kfree(seq);

		}

	}

	}

	write_unlock_bh(&tipc_nametbl_lock);

	write_unlock_bh(&tipc_nametbl_lock);

}

}