|
@@ -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 @@ next:
|
|
|
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 @@ next:
|
|
|
|
|
|
iter->p = NULL;
|
|
|
|
|
|
-out:
|
|
|
-
|
|
|
- return obj;
|
|
|
+ return NULL;
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_walk_next);
|
|
|
|