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

Commit c936a79f authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

rhashtable: Simplify iterator code 



Remove useless obj variable and goto logic.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a376de8

lib/rhashtable.c

+2 −6
Original line number Diff line number Diff line
@@ -579,7 +579,6 @@ void *rhashtable_walk_next(struct rhashtable_iter *iter) 
	struct bucket_table *tbl = iter->walker->tbl;

	struct rhashtable *ht = iter->ht;

	struct rhash_head *p = iter->p;

	void *obj = NULL;



	if (p) {

		p = rht_dereference_bucket_rcu(p->next, tbl, iter->slot);
@@ -599,8 +598,7 @@ void *rhashtable_walk_next(struct rhashtable_iter *iter) 
		if (!rht_is_a_nulls(p)) {

			iter->skip++;

			iter->p = p;

			obj = rht_obj(ht, p);

			goto out;

			return rht_obj(ht, p);

		}



		iter->skip = 0;
@@ -618,9 +616,7 @@ void *rhashtable_walk_next(struct rhashtable_iter *iter) 


	iter->p = NULL;



out:



	return obj;

	return NULL;

}

EXPORT_SYMBOL_GPL(rhashtable_walk_next);