From patchwork Mon Nov 12 20:00:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1730261 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D531B3FCAE for ; Mon, 12 Nov 2012 20:01:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752803Ab2KLUBQ (ORCPT ); Mon, 12 Nov 2012 15:01:16 -0500 Received: from mail-vc0-f174.google.com ([209.85.220.174]:61244 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752395Ab2KLUBP (ORCPT ); Mon, 12 Nov 2012 15:01:15 -0500 Received: by mail-vc0-f174.google.com with SMTP id fk26so6536725vcb.19 for ; Mon, 12 Nov 2012 12:01:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=7YtBMNg/gJ/8vzuJ+KjQeGvxTHSdeEv9Z6ulXw9fjmA=; b=KdT99xoNwXV8RAQ2zVrUisjCRSPrkicDKsFEF/fO61qNEgNVigkZE1Sb0+xsLzKKqW pguy7SbGXh8rWPfS98ZKjzoFdpapGnPw2SQzq5J46AjdURLIisaz/mDtrlGLNS6R0Emj cMCs1lLLQAS1Tl4Iorf58G97dtMi88uWpqodCOOt70430kqQaB4jg/BT92Izga1ZPpib NK/HLPJlodrxCryoTs0/Dt/IQJxUZGALeII1TCoC7bPAy5o+YR/uRzWMjFQK/GZmC8II 5zWfQSZLXyvTaYMNth7zagX4FZYDbDOq3sYul8UuIsKlYlZz48aWQLvBtN3lAOCqaGn8 J33g== Received: by 10.58.2.71 with SMTP id 7mr22598772ves.42.1352750474825; Mon, 12 Nov 2012 12:01:14 -0800 (PST) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id dh10sm7390369veb.8.2012.11.12.12.01.13 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 12:01:13 -0800 (PST) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 06/11] nfsd: break out reclaim record removal into separate function Date: Mon, 12 Nov 2012 15:00:53 -0500 Message-Id: <1352750458-16857-7-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352750458-16857-1-git-send-email-jlayton@redhat.com> References: <1352750458-16857-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQk76yX7qHnzmt/GzHyITYywjvOEcqH86USOceYG3MyFGqGxoz5yFh2+3M9eYfer+9FtGjrx Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org We'll need to be able to call this from nfs4recover.c eventually. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 12 +++++++++--- fs/nfsd/state.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 18e5549..24dcda2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4517,6 +4517,14 @@ nfs4_client_to_reclaim(const char *name) } void +nfs4_remove_reclaim_record(struct nfs4_client_reclaim *crp) +{ + list_del(&crp->cr_strhash); + kfree(crp); + reclaim_str_hashtbl_size--; +} + +void nfs4_release_reclaim(void) { struct nfs4_client_reclaim *crp = NULL; @@ -4526,9 +4534,7 @@ nfs4_release_reclaim(void) while (!list_empty(&reclaim_str_hashtbl[i])) { crp = list_entry(reclaim_str_hashtbl[i].next, struct nfs4_client_reclaim, cr_strhash); - list_del(&crp->cr_strhash); - kfree(crp); - reclaim_str_hashtbl_size--; + nfs4_remove_reclaim_record(crp); } } BUG_ON(reclaim_str_hashtbl_size); diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index c41c280..3528616 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -465,6 +465,7 @@ extern __be32 nfs4_preprocess_stateid_op(struct net *net, extern void nfs4_lock_state(void); extern void nfs4_unlock_state(void); extern int nfs4_in_grace(void); +void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *); extern void nfs4_release_reclaim(void); extern struct nfs4_client_reclaim *nfsd4_find_reclaim_client(const char *recdir); extern __be32 nfs4_check_open_reclaim(clientid_t *clid, bool sessions);