[PATCH 1/5] lib/rhashtable: convert param sanitations to WARN_ON
From: Davidlohr Bueso <dave@stgolabs.net>
Date: 2018-06-01 16:02:09
Also in:
lkml
Subsystem:
library code, rhashtable, the rest · Maintainers:
Andrew Morton, Thomas Graf, Herbert Xu, Linus Torvalds
For the purpose of making rhashtable_init() unable to fail, we can replace the returning -EINVAL with WARN_ONs whenever the caller passes bogus parameters during initialization. Signed-off-by: Davidlohr Bueso <redacted> --- lib/rhashtable.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 9427b5766134..05a4b1b8b8ce 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c@@ -1024,12 +1024,11 @@ int rhashtable_init(struct rhashtable *ht, size = HASH_DEFAULT_SIZE; - if ((!params->key_len && !params->obj_hashfn) || - (params->obj_hashfn && !params->obj_cmpfn)) - return -EINVAL; + WARN_ON((!params->key_len && !params->obj_hashfn) || + (params->obj_hashfn && !params->obj_cmpfn)); - if (params->nulls_base && params->nulls_base < (1U << RHT_BASE_SHIFT)) - return -EINVAL; + WARN_ON(params->nulls_base && + params->nulls_base < (1U << RHT_BASE_SHIFT)); memset(ht, 0, sizeof(*ht)); mutex_init(&ht->mutex);
--
2.16.3