From patchwork Thu Jun 26 19:21:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4431211 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A03F09F402 for ; Thu, 26 Jun 2014 19:22:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C56D22028D for ; Thu, 26 Jun 2014 19:22:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F379B201BA for ; Thu, 26 Jun 2014 19:22:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751676AbaFZTV4 (ORCPT ); Thu, 26 Jun 2014 15:21:56 -0400 Received: from mail-qa0-f44.google.com ([209.85.216.44]:37018 "EHLO mail-qa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751883AbaFZTVv (ORCPT ); Thu, 26 Jun 2014 15:21:51 -0400 Received: by mail-qa0-f44.google.com with SMTP id hw13so3203976qab.3 for ; Thu, 26 Jun 2014 12:21:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=9Tnoa3RDD4KxCv/23HUH/N/2tIXby/oyVZkjJh4dcyk=; b=B+nnkRbb+eUdnhpzhf1SsgzP5QKADI3U3OFoJNYYENdUVd6Xn8l839IdfWwOHMG9jC miefiLYiptEGjQtY21HyODJFEOg6Jsg6YH8ZOFsF0/FR9tWSGPo60iUAQ6CjOrDT0U4+ oymjyZrv7Z8mIprcNocW4OVuDfpdAW5zqPjSAPcYUFkQ1bZAFwTPD2Oy/+VY5p+rsJtr arAIZpJwiPYdFc/emSOGnE0ngyzRtB+kQHhlNsnmEkMfCFWUgqq9nxXASfsJ5ny6FQgh ebQPwCwZpIKvM8waVdymlvbXtP8geXcbgPljTQasinCXmQzZ94QMugdLHOBgLd7x+gXV rfqQ== X-Gm-Message-State: ALoCoQlAQeya56Qy13I3C86SbnnyBt85XZKeSwUv9ZuY3E8UDA3UurB7Rpti/P8IHG+t/43JXLSY X-Received: by 10.140.88.241 with SMTP id t104mr24360692qgd.29.1403810511350; Thu, 26 Jun 2014 12:21:51 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id k76sm4765555qgd.38.2014.06.26.12.21.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jun 2014 12:21:50 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 099/117] nfsd: add a list_head arg to nfsd_foreach_client_lock Date: Thu, 26 Jun 2014 15:21:07 -0400 Message-Id: <1403810485-16497-16-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403810017-16062-1-git-send-email-jlayton@primarydata.com> References: <1403810017-16062-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In a later patch, we'll want to collect the locks onto a list for later destruction. If "func" is defined and "collect" is defined, then we'll add the lock stateid to the list. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 9feb219e8699..c26ecd4ad3b2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5778,6 +5778,7 @@ static void nfsd_print_count(struct nfs4_client *clp, unsigned int count, } static u64 nfsd_foreach_client_lock(struct nfs4_client *clp, u64 max, + struct list_head *collect, void (*func)(struct nfs4_ol_stateid *)) { struct nfs4_openowner *oop; @@ -5790,8 +5791,12 @@ static u64 nfsd_foreach_client_lock(struct nfs4_client *clp, u64 max, &oop->oo_owner.so_stateids, st_perstateowner) { list_for_each_entry_safe(lst, lst_next, &stp->st_locks, st_locks) { - if (func) + if (func) { func(lst); + if (collect) + list_add(&lst->st_locks, + collect); + } if (++count == max) return count; } @@ -5803,12 +5808,12 @@ static u64 nfsd_foreach_client_lock(struct nfs4_client *clp, u64 max, u64 nfsd_forget_client_locks(struct nfs4_client *clp, u64 max) { - return nfsd_foreach_client_lock(clp, max, release_lock_stateid); + return nfsd_foreach_client_lock(clp, max, NULL, release_lock_stateid); } u64 nfsd_print_client_locks(struct nfs4_client *clp, u64 max) { - u64 count = nfsd_foreach_client_lock(clp, max, NULL); + u64 count = nfsd_foreach_client_lock(clp, max, NULL, NULL); nfsd_print_count(clp, count, "locked files"); return count; }