rhashtable: use rht_obj() consistently

From: Johannes Berg <redacted>

Looking at the RHT code I found two places where this was
done manually rather than using the rht_obj() helper, use
that instead.

Signed-off-by: Johannes Berg <redacted>
---
 lib/rhashtable.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 6c3c723e902b..a8ea16093839 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c

@@ -457,7 +457,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;

@@ -491,7 +491,7 @@ void *rhashtable_lookup_compare(const struct rhashtable *ht, u32 hash,
 	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;

-- 
2.1.4

On 02/13/15 at 09:42pm, Johannes Berg wrote:

From: Johannes Berg <redacted>

Looking at the RHT code I found two places where this was
done manually rather than using the rht_obj() helper, use
that instead.

Signed-off-by: Johannes Berg <redacted>

Acked-by: Thomas Graf <tgraf@suug.ch>

On 02/13/15 at 08:58pm, Thomas Graf wrote:

On 02/13/15 at 09:42pm, Johannes Berg wrote:

quoted

From: Johannes Berg <redacted>

Looking at the RHT code I found two places where this was
done manually rather than using the rht_obj() helper, use
that instead.

Signed-off-by: Johannes Berg <redacted>

Acked-by: Thomas Graf <tgraf@suug.ch>

Actually, this is already "fixed" in net-next.

From: Thomas Graf <tgraf@suug.ch>
Date: Fri, 13 Feb 2015 21:42:08 +0000

On 02/13/15 at 08:58pm, Thomas Graf wrote:

quoted

On 02/13/15 at 09:42pm, Johannes Berg wrote:

quoted

From: Johannes Berg <redacted>

Looking at the RHT code I found two places where this was
done manually rather than using the rht_obj() helper, use
that instead.

Signed-off-by: Johannes Berg <redacted>

Acked-by: Thomas Graf <tgraf@suug.ch>

Actually, this is already "fixed" in net-next.

So I'm going to toss this.