[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Tue, 5 May 2015 02:22:53 +0200
From: Thomas Graf <tgraf@...g.ch>
To: davem@...emloft.net
Cc: herbert@...dor.apana.org.au, netdev@...r.kernel.org
Subject: [PATCH net-next v2] rhashtable: Simplify iterator code
Remove useless obj variable and goto logic.
Signed-off-by: Thomas Graf <tgraf@...g.ch>
Acked-by: Herbert Xu <herbert@...dor.apana.org.au>
---
v2: simple repost a standalone patch
lib/rhashtable.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index b28df40..4936fc4 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -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);
--
2.3.5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists