From: Davidlohr Bueso <dave@stgolabs.net>
To: akpm@linux-foundation.org, torvalds@linux-foundation.org
Cc: tgraf@suug.ch, herbert@gondor.apana.org.au,
manfred@colorfullife.com,
guillaume.knispel@supersonicimagine.com,
linux-api@vger.kernel.org, linux-kernel@vger.kernel.org,
Davidlohr Bueso <dave@stgolabs.net>,
Davidlohr Bueso <dbueso@suse.de>
Subject: [PATCH 1/6] lib/rhashtable: convert param sanitations to WARN_ON
Date: Thu, 24 May 2018 14:11:30 -0700 [thread overview]
Message-ID: <20180524211135.27760-2-dave@stgolabs.net> (raw)
In-Reply-To: <20180524211135.27760-1-dave@stgolabs.net>
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 <dbueso@suse.de>
---
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.13.6
next prev parent reply other threads:[~2018-05-24 21:28 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-24 21:11 [PATCH -next 0/6] rhashtable: guarantee first allocation Davidlohr Bueso
2018-05-24 21:11 ` Davidlohr Bueso [this message]
2018-05-28 9:40 ` [PATCH 1/6] lib/rhashtable: convert param sanitations to WARN_ON Herbert Xu
2018-05-28 13:12 ` Davidlohr Bueso
2018-05-28 15:54 ` Herbert Xu
2018-05-28 15:51 ` Davidlohr Bueso
2018-05-24 21:11 ` [PATCH 2/6] lib/rhashtable: guarantee initial hashtable allocation Davidlohr Bueso
2018-05-25 3:26 ` Davidlohr Bueso
2018-05-28 9:49 ` Herbert Xu
2018-05-29 17:03 ` Davidlohr Bueso
2018-05-29 18:04 ` Herbert Xu
2018-05-29 17:59 ` Davidlohr Bueso
2018-05-29 18:27 ` Herbert Xu
2018-05-30 14:29 ` Davidlohr Bueso
2018-05-28 10:02 ` Herbert Xu
2018-05-29 16:42 ` Davidlohr Bueso
2018-05-29 18:03 ` Herbert Xu
2018-05-29 17:55 ` Davidlohr Bueso
2018-05-29 18:15 ` Herbert Xu
2018-05-29 18:05 ` Davidlohr Bueso
2018-05-24 21:11 ` [PATCH 3/6] lib/bucket_locks: use kvmalloc_array() Davidlohr Bueso
2018-05-24 21:37 ` Linus Torvalds
2018-05-29 14:43 ` Michal Hocko
2018-05-29 14:51 ` Michal Hocko
2018-05-29 20:46 ` Linus Torvalds
2018-05-30 7:42 ` Michal Hocko
2018-05-31 15:01 ` Linus Torvalds
2018-05-31 15:29 ` Michal Hocko
2018-05-24 21:11 ` [PATCH 4/6] ipc: get rid of ids->tables_initialized hack Davidlohr Bueso
2018-05-24 21:11 ` [PATCH 5/6] ipc: simplify ipc initialization Davidlohr Bueso
2018-05-24 21:11 ` [PATCH 6/6] lib/test_rhashtable: rhashtable_init() can no longer fail Davidlohr Bueso
2018-05-24 21:41 ` [PATCH -next 0/6] rhashtable: guarantee first allocation Linus Torvalds
2018-05-25 3:34 ` Davidlohr Bueso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180524211135.27760-2-dave@stgolabs.net \
--to=dave@stgolabs.net \
--cc=akpm@linux-foundation.org \
--cc=dbueso@suse.de \
--cc=guillaume.knispel@supersonicimagine.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manfred@colorfullife.com \
--cc=tgraf@suug.ch \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).