From patchwork Thu Feb 27 21:15:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11410561 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 626A917E0 for ; Thu, 27 Feb 2020 21:41:17 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4B18F24690 for ; Thu, 27 Feb 2020 21:41:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B18F24690 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 0F72B34A930; Thu, 27 Feb 2020 13:33:34 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 6EF0621FF8C for ; Thu, 27 Feb 2020 13:20:40 -0800 (PST) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id A0DBA9161; Thu, 27 Feb 2020 16:18:18 -0500 (EST) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 9FE19468; Thu, 27 Feb 2020 16:18:18 -0500 (EST) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Thu, 27 Feb 2020 16:15:24 -0500 Message-Id: <1582838290-17243-457-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> References: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 456/622] lustre: fld: remove fci_no_shrink field. X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Mr NeilBrown This field is never set, so is always zero. Remove it, and the one place where it is tested. WC-bug-id: https://jira.whamcloud.com/browse/LU-6142 Lustre-commit: e669586775c6 ("LU-6142 fld: remove fci_no_shrink field.") Signed-off-by: Mr NeilBrown Reviewed-on: https://review.whamcloud.com/35875 Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Shaun Tancheff Reviewed-by: Arshad Hussain Signed-off-by: James Simmons --- fs/lustre/fld/fld_cache.c | 3 +-- fs/lustre/fld/fld_internal.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/lustre/fld/fld_cache.c b/fs/lustre/fld/fld_cache.c index 5267ba2..79b10bb 100644 --- a/fs/lustre/fld/fld_cache.c +++ b/fs/lustre/fld/fld_cache.c @@ -381,8 +381,7 @@ static int fld_cache_insert_nolock(struct fld_cache *cache, * insertion loop. */ - if (!cache->fci_no_shrink) - fld_cache_shrink(cache); + fld_cache_shrink(cache); head = &cache->fci_entries_head; diff --git a/fs/lustre/fld/fld_internal.h b/fs/lustre/fld/fld_internal.h index 465c6ccf..53648d2 100644 --- a/fs/lustre/fld/fld_internal.h +++ b/fs/lustre/fld/fld_internal.h @@ -109,7 +109,6 @@ struct fld_cache { /** Cache name used for debug and messages. */ char fci_name[LUSTRE_MDT_MAXNAMELEN]; - unsigned int fci_no_shrink:1; }; enum {