summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2015-01-02 23:00:15 +0100
committerDavid S. Miller <davem@davemloft.net>2015-01-03 20:32:56 +0100
commita4b18cda4c2676a4b4b59622b2e0394dc153e00b (patch)
tree9be5c3e8586a2248d8b097d975f5d3e870d5a741
parentrhashtable: Do hashing inside of rhashtable_lookup_compare() (diff)
downloadlinux-a4b18cda4c2676a4b4b59622b2e0394dc153e00b.tar.xz
linux-a4b18cda4c2676a4b4b59622b2e0394dc153e00b.zip
rhashtable: Use rht_obj() instead of manual offset calculation
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--lib/rhashtable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 1ee0eb636ca3..b658245826a1 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -427,7 +427,7 @@ void *rhashtable_lookup(const struct rhashtable *ht, const void *key)
if (memcmp(rht_obj(ht, he) + ht->p.key_offset, key,
ht->p.key_len))
continue;
- return (void *) he - ht->p.head_offset;
+ return rht_obj(ht, he);
}
return NULL;
@@ -460,7 +460,7 @@ void *rhashtable_lookup_compare(const struct rhashtable *ht, const void *key,
rht_for_each_rcu(he, tbl->buckets[hash], ht) {
if (!compare(rht_obj(ht, he), arg))
continue;
- return (void *) he - ht->p.head_offset;
+ return rht_obj(ht, he);
}
return NULL;