Delete more shim layer code

[bcachefs-tools-debian] / include / linux / rhashtable.h

diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h
index f3faea17b4a310c571104dd877afb97527519355..8dbe1533d54cb9cfa1523a93c09217c6d3df5de3 100644 (file)
--- a/include/linux/rhashtable.h
+++ b/include/linux/rhashtable.h
@@ -20,11 +20,9 @@
 #include <linux/atomic.h>
 #include <linux/cache.h>
 #include <linux/compiler.h>
-#include <linux/cpumask.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/jhash.h>
-#include <linux/list_nulls.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
@@ -96,6 +94,8 @@ struct rhashtable_walker {
        struct bucket_table *tbl;
 };
 
+#define NULLS_MARKER(value) (1UL | (((long)value) << 1))
+
 static inline unsigned long rht_marker(const struct rhashtable *ht, u32 hash)
 {
        return NULLS_MARKER(ht->p.nulls_base + hash);
@@ -109,11 +109,6 @@ static inline bool rht_is_a_nulls(const struct rhash_head *ptr)
        return ((unsigned long) ptr & 1);
 }
 
-static inline unsigned long rht_get_nulls_value(const struct rhash_head *ptr)
-{
-       return ((unsigned long) ptr) >> 1;
-}
-
 static inline void *rht_obj(const struct rhashtable *ht,
                            const struct rhash_head *he)
 {