Received: by 10.192.165.148 with SMTP id m20csp3940275imm; Mon, 23 Apr 2018 15:31:18 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/S+wBKulLZ2Lef1TJS+DtbEOV36MrU/cdMpTZq4fXhQS3+tT32Luq5KR/MkJ5PWjZb+2Z0 X-Received: by 10.99.115.69 with SMTP id d5mr18053408pgn.289.1524522678111; Mon, 23 Apr 2018 15:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524522678; cv=none; d=google.com; s=arc-20160816; b=UgpdMANTXHh6hgO8jJYp6IP+LWv7zzi+zJb19xiKoYHKSUH3cxYsH5iKklFK+/JsPC XkRDJ8nqKHRWVezqXFkea0OSnl/vMWfF3GZZPJ7iEyPtUeFE2bZaJUKfP/aJA44+w55E j9kWBCZR+TX1Skxm3vRgVPere5oi9r5tPKzKEvEtCM//ttAuVrohBQXgkxqPAlIdGHG/ ibrsfwf2DViNVpX9cevnzCpcQm0BW6l6F6Mzt3tQ4Nj+YuilNclaYf1IJsZxQaoNeYy0 B85zICyLm2DJIr2o+CnOlZBR+jFUusRzEkyGWDSkgmCTdj/vVLfS1k/F9kAkFNjzoLb0 Cr4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:cc:subject:date:to :from:arc-authentication-results; bh=0u7AwU7J8GVsS1StHpduwMwOExX8sGVm9YvcLpYSUxE=; b=M0uafIhynqqkdnxCbLiOyDjFIg4gU4B3Tk+adz/B2n/grMzWdmXgv2Nx0avE8Wh0sp ClnXlo9LObNrbQGWXKlQWd5pCvBcT3tV9heT3KZOPvXisiCBr6UNenlb8QxW+SE8onwf jbPbMKE3Q0GmUapWhZyz/gbT69hjy0XdQYxSEgchZWOlv+rTHJxtyyqrmxTYCzImqy7J NMPhyAAVU4H6dTVfVUgath4TEaiQWOFowHi/s3+oHCiOLCJNqBzKezAwNX/SaTQiJnUm 6KOJYcAaDnRgBgZV+CRgKx36/EBD8aAWufE5XOjSgiToiUAZT/QZtLsoUXVsE6asyTKP eTnA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b62si5563229pgc.505.2018.04.23.15.31.03; Mon, 23 Apr 2018 15:31:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932608AbeDWW3u (ORCPT + 99 others); Mon, 23 Apr 2018 18:29:50 -0400 Received: from mx2.suse.de ([195.135.220.15]:54575 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932367AbeDWW3p (ORCPT ); Mon, 23 Apr 2018 18:29:45 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6157AAC92; Mon, 23 Apr 2018 22:29:44 +0000 (UTC) From: NeilBrown To: Thomas Graf , Herbert Xu , David Miller Date: Tue, 24 Apr 2018 08:29:13 +1000 Subject: [PATCH 1/4] rhashtable: remove outdated comments about grow_decision etc Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <152452255339.1456.7705319430843121379.stgit@noble> In-Reply-To: <152452244405.1456.8175298512483573078.stgit@noble> References: <152452244405.1456.8175298512483573078.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org grow_decision and shink_decision no longer exist, so remove the remaining references to them. Acked-by: Herbert Xu Signed-off-by: NeilBrown --- include/linux/rhashtable.h | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index 1f8ad121eb43..87d443a5b11d 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h @@ -836,9 +836,8 @@ static inline void *__rhashtable_insert_fast( * * It is safe to call this function from atomic context. * - * Will trigger an automatic deferred table resizing if the size grows - * beyond the watermark indicated by grow_decision() which can be passed - * to rhashtable_init(). + * Will trigger an automatic deferred table resizing if residency in the + * table grows beyond 70%. */ static inline int rhashtable_insert_fast( struct rhashtable *ht, struct rhash_head *obj, @@ -866,9 +865,8 @@ static inline int rhashtable_insert_fast( * * It is safe to call this function from atomic context. * - * Will trigger an automatic deferred table resizing if the size grows - * beyond the watermark indicated by grow_decision() which can be passed - * to rhashtable_init(). + * Will trigger an automatic deferred table resizing if residency in the + * table grows beyond 70%. */ static inline int rhltable_insert_key( struct rhltable *hlt, const void *key, struct rhlist_head *list, @@ -890,9 +888,8 @@ static inline int rhltable_insert_key( * * It is safe to call this function from atomic context. * - * Will trigger an automatic deferred table resizing if the size grows - * beyond the watermark indicated by grow_decision() which can be passed - * to rhashtable_init(). + * Will trigger an automatic deferred table resizing if residency in the + * table grows beyond 70%. */ static inline int rhltable_insert( struct rhltable *hlt, struct rhlist_head *list, @@ -922,9 +919,8 @@ static inline int rhltable_insert( * * It is safe to call this function from atomic context. * - * Will trigger an automatic deferred table resizing if the size grows - * beyond the watermark indicated by grow_decision() which can be passed - * to rhashtable_init(). + * Will trigger an automatic deferred table resizing if residency in the + * table grows beyond 70%. */ static inline int rhashtable_lookup_insert_fast( struct rhashtable *ht, struct rhash_head *obj, @@ -981,9 +977,8 @@ static inline void *rhashtable_lookup_get_insert_fast( * * Lookups may occur in parallel with hashtable mutations and resizing. * - * Will trigger an automatic deferred table resizing if the size grows - * beyond the watermark indicated by grow_decision() which can be passed - * to rhashtable_init(). + * Will trigger an automatic deferred table resizing if residency in the + * table grows beyond 70%. * * Returns zero on success. */ @@ -1134,8 +1129,8 @@ static inline int __rhashtable_remove_fast( * walk the bucket chain upon removal. The removal operation is thus * considerable slow if the hash table is not correctly sized. * - * Will automatically shrink the table via rhashtable_expand() if the - * shrink_decision function specified at rhashtable_init() returns true. + * Will automatically shrink the table if permitted when residency drops + * below 30%. * * Returns zero on success, -ENOENT if the entry could not be found. */ @@ -1156,8 +1151,8 @@ static inline int rhashtable_remove_fast( * walk the bucket chain upon removal. The removal operation is thus * considerable slow if the hash table is not correctly sized. * - * Will automatically shrink the table via rhashtable_expand() if the - * shrink_decision function specified at rhashtable_init() returns true. + * Will automatically shrink the table if permitted when residency drops + * below 30% * * Returns zero on success, -ENOENT if the entry could not be found. */