Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp773339imw; Fri, 8 Jul 2022 11:25:08 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tdPvZEJj2plOar4RN8VsiYfCfZfgc2pg0WhwFFCOo5335kvS6GxEj7i1BqwJwRsK1tSKTM X-Received: by 2002:a17:902:9b95:b0:16c:28fd:67fd with SMTP id y21-20020a1709029b9500b0016c28fd67fdmr2546543plp.87.1657304708417; Fri, 08 Jul 2022 11:25:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657304708; cv=none; d=google.com; s=arc-20160816; b=lCzj6CWSCdaDceu/y2l3Z2mudBzRa3LfaRzEm5OqV8h3GOmPLAdhIlNI+dwiVhMMO2 j4G6l+4FPwrx5A73vYO72X0C2NphSrixeOJWx3bRbtcLzKqznrEJCJbE8Hzf8RzPwIx+ NNyf3UJ9F+6MPK7bHiknTJvgV8Owir7VABgGW1rKHqEISqgnHtQowYEv6fBViu0io+I4 skH20IQNk9Ri12FQmzHOkCaJ5m7MsEN4iPzTNvfO05pEO4RPXY4rgrw/vBerOSFeMsBP 6hI+SYARR9J2l80vZ7gK2twMFTAC5dh2HimrITzZ3/k3dnrM0CUpqE+sp4tLa1eP+4H8 raQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=s5CC4pB9s12nZa5Kwk5akrc9m5jv3QmlnPfjMz41gFk=; b=N+2JCHOMcrJQwU53rUsYr9PoavDZP9DYYZS8xLjZdT9NpHg0Gx2uJVvZAsBv08J7YQ +oABGU/MCrVuYFUIunB3qvqM9XGojek5Pxgo/0SkE6sqfn6kNrIhZ1rSBqyjwaLsGY0/ DkiEcnUKAZ5EaPvEiYVqM2k7G4MZguZlwFsKV9ceUl8ErBN64i5Wt/jp8+rWEnQos2CY /RvCQ4A1n4mx7bNiwmo0hQ4wKQK/UKYG28UbCZAOUKB6/ZSSVgl5hPrvmpWY22DUrMhG uKB0qowKHvqvZb0FVWddW4S7rSWlOg24NQEiUw7qVP4YlAQokFoeL5BNaxqlJ2vqf8ci 7AWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k10-20020a635a4a000000b0040d3fd7ddcesi30827202pgm.370.2022.07.08.11.24.56; Fri, 08 Jul 2022 11:25:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237827AbiGHSYc (ORCPT + 99 others); Fri, 8 Jul 2022 14:24:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239344AbiGHSY3 (ORCPT ); Fri, 8 Jul 2022 14:24:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A186ADFEE; Fri, 8 Jul 2022 11:24:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3CD3362474; Fri, 8 Jul 2022 18:24:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4142AC341C0; Fri, 8 Jul 2022 18:24:26 +0000 (UTC) Subject: [PATCH v3 07/32] NFSD: Refactor nfsd_file_gc() From: Chuck Lever To: linux-nfs@vger.kernel.org, netdev@vger.kernel.org Cc: david@fromorbit.com, jlayton@redhat.com, tgraf@suug.ch Date: Fri, 08 Jul 2022 14:24:25 -0400 Message-ID: <165730466519.28142.5952539262993995451.stgit@klimt.1015granger.net> In-Reply-To: <165730437087.28142.6731645688073512500.stgit@klimt.1015granger.net> References: <165730437087.28142.6731645688073512500.stgit@klimt.1015granger.net> User-Agent: StGit/1.5.dev3+g9561319 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Refactor nfsd_file_gc() to use the new list_lru helper. Signed-off-by: Chuck Lever --- fs/nfsd/filecache.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index b278030e0a12..4e1162f51a70 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -498,7 +498,11 @@ nfsd_file_lru_walk_list(struct shrink_control *sc) static void nfsd_file_gc(void) { - nfsd_file_lru_walk_list(NULL); + LIST_HEAD(dispose); + + list_lru_walk(&nfsd_file_lru, nfsd_file_lru_cb, + &dispose, LONG_MAX); + nfsd_file_gc_dispose_list(&dispose); } static void