From patchwork Tue Oct 30 20:50:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Schumaker X-Patchwork-Id: 1673901 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7BE15DFB7B for ; Tue, 30 Oct 2012 20:51:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751271Ab2J3UvA (ORCPT ); Tue, 30 Oct 2012 16:51:00 -0400 Received: from mx2.netapp.com ([216.240.18.37]:57592 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753046Ab2J3Uu7 (ORCPT ); Tue, 30 Oct 2012 16:50:59 -0400 X-IronPort-AV: E=Sophos;i="4.80,682,1344236400"; d="scan'208";a="705437854" Received: from smtp2.corp.netapp.com ([10.57.159.114]) by mx2-out.netapp.com with ESMTP; 30 Oct 2012 13:50:59 -0700 Received: from davros.hq.netapp.com (davros.hq.netapp.com [10.63.233.208]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id q9UKos17017270; Tue, 30 Oct 2012 13:50:58 -0700 (PDT) From: bjschuma@netapp.com To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 03/10] NFSD: Clean up forgetting clients Date: Tue, 30 Oct 2012 16:50:47 -0400 Message-Id: <1351630254-26166-4-git-send-email-bjschuma@netapp.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1351630254-26166-1-git-send-email-bjschuma@netapp.com> References: <1351630254-26166-1-git-send-email-bjschuma@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Bryan Schumaker I added in a generic for-each loop that takes a pass over the client_lru list and calls some function. The next few patches will update other operations to use this function as well. A value of 0 still means "forget everything that is found". Signed-off-by: Bryan Schumaker --- fs/nfsd/nfs4state.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index cf79c3b..3c5719a 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4556,18 +4556,31 @@ nfs4_check_open_reclaim(clientid_t *clid, bool sessions) #ifdef CONFIG_NFSD_FAULT_INJECTION -void nfsd_forget_clients(u64 num) +static u64 nfsd_forget_client(struct nfs4_client *clp, u64 max) +{ + nfsd4_client_record_remove(clp); + expire_client(clp); + return 1; +} + +static u64 nfsd_for_n_state(u64 max, u64 (*func)(struct nfs4_client *, u64)) { struct nfs4_client *clp, *next; - int count = 0; + u64 count = 0; list_for_each_entry_safe(clp, next, &client_lru, cl_lru) { - expire_client(clp); - if (++count == num) + count += func(clp, max - count); + if ((max != 0) && (count >= max)) break; } - printk(KERN_INFO "NFSD: Forgot %d clients", count); + return count; +} + +void nfsd_forget_clients(u64 num) +{ + u64 count = nfsd_for_n_state(num, nfsd_forget_client); + printk(KERN_INFO "NFSD: Forgot %llu clients", count); } static void release_lockowner_sop(struct nfs4_stateowner *sop)