From patchwork Fri Mar 20 08:13:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: li qongqing X-Patchwork-Id: 452507 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BE7EA14016B for ; Fri, 20 Mar 2015 19:16:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751390AbbCTIP6 (ORCPT ); Fri, 20 Mar 2015 04:15:58 -0400 Received: from mail.windriver.com ([147.11.1.11]:55379 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751132AbbCTIPz (ORCPT ); Fri, 20 Mar 2015 04:15:55 -0400 Received: from localhost (lirq-optiplex-780.corp.ad.wrs.com [128.224.162.137]) by mail.windriver.com (8.14.9/8.14.5) with ESMTP id t2K8DvYu002358; Fri, 20 Mar 2015 01:13:58 -0700 (PDT) From: rongqing.li@windriver.com To: netdev@vger.kernel.org, tgraf@suug.ch, herbert@gondor.apana.org.au Subject: [PATCH][net-next] rhashtable: ensure that ht->p.min_size is round up to the power of two Date: Fri, 20 Mar 2015 16:13:57 +0800 Message-Id: <1426839237-10345-1-git-send-email-rongqing.li@windriver.com> X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Li RongQing ht->p.min_size will be reset to params->min_size, which has been set to the params->min_size round up of the power of two, should be kept Signed-off-by: Li RongQing Cc: Thomas Graf Cc: Herbert Xu --- lib/rhashtable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rhashtable.c b/lib/rhashtable.c index e75c48d..fda169b 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -946,7 +946,7 @@ int rhashtable_init(struct rhashtable *ht, struct rhashtable_params *params) if (params->max_size) ht->p.max_size = rounddown_pow_of_two(params->max_size); - ht->p.min_size = max(params->min_size, HASH_MIN_SIZE); + ht->p.min_size = max(ht->p.min_size, HASH_MIN_SIZE); if (params->locks_mul) ht->p.locks_mul = roundup_pow_of_two(params->locks_mul);