From patchwork Fri Nov 9 20:06:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1721801 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 78D583FCA5 for ; Fri, 9 Nov 2012 20:06:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755709Ab2KIUGy (ORCPT ); Fri, 9 Nov 2012 15:06:54 -0500 Received: from mail-vc0-f174.google.com ([209.85.220.174]:61101 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755681Ab2KIUGx (ORCPT ); Fri, 9 Nov 2012 15:06:53 -0500 Received: by mail-vc0-f174.google.com with SMTP id fk26so4183151vcb.19 for ; Fri, 09 Nov 2012 12:06:52 -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=c4LDZ2sQA9dFq72kJGOlGw9u1+DVpnr6zvm9s09jVmQ=; b=nIRjOSGLkhppbd4rTHOf954OcWuzPW28gfLz2aY1e1oDxWabXw2hMyaEyTgOPlMA1U 8pWv9sRjDWTV5ScOEFDE9TyNwOKEPkFhRi5S0MHsALHBB0DOLvYKcxRmJwzCgS+6/+T5 5c8CWRoQNRZj8y6osuJLV9xoAcdxJNDkU+n0RI03HodVxSb+33arPf9Jvu7jALcb1E30 U9XnW3RZncN/IqpzsV19A1iHvw2TWYIlxBmPwhHKaWAvfh/2zYm6p1aU1eJlemgNiAJ2 F3stQzoAx9V3rk97pt7OXlXR8dBcv/U60Mho2f0YY4oyM0asDPseVyYdgukzTWr+k+6r Tbyw== Received: by 10.52.23.225 with SMTP id p1mr10059381vdf.79.1352491612426; Fri, 09 Nov 2012 12:06:52 -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 yf5sm13905869veb.13.2012.11.09.12.06.50 (version=SSLv3 cipher=OTHER); Fri, 09 Nov 2012 12:06:51 -0800 (PST) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC 1/7] nfsd: remove unused argument to nfs4_has_reclaimed_state Date: Fri, 9 Nov 2012 15:06:38 -0500 Message-Id: <1352491604-21605-2-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352491604-21605-1-git-send-email-jlayton@redhat.com> References: <1352491604-21605-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQm0RhwhHiOsuUe2gq1KfMWGi0pxSrFBRgmTXV6QFy71xJU/9d/7W43cyibQUg2R4vcekAUT Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Jeff Layton --- fs/nfsd/nfs4recover.c | 2 +- fs/nfsd/nfs4state.c | 2 +- fs/nfsd/state.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 0a9ac9d..10b7f47 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -319,7 +319,7 @@ purge_old(struct dentry *parent, struct dentry *child) { int status; - if (nfs4_has_reclaimed_state(child->d_name.name, false)) + if (nfs4_has_reclaimed_state(child->d_name.name)) return 0; status = vfs_rmdir(parent->d_inode, child); diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index fba2996..f15a2a0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4465,7 +4465,7 @@ alloc_reclaim(void) } int -nfs4_has_reclaimed_state(const char *name, bool use_exchange_id) +nfs4_has_reclaimed_state(const char *name) { unsigned int strhashval = clientstr_hashval(name); struct nfs4_client *clp; diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index e036894..bd734f0 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -470,7 +470,7 @@ extern void nfsd4_shutdown_callback(struct nfs4_client *); extern void nfs4_put_delegation(struct nfs4_delegation *dp); extern __be32 nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname); extern int nfs4_client_to_reclaim(const char *name); -extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id); +extern int nfs4_has_reclaimed_state(const char *name); extern void release_session_client(struct nfsd4_session *); extern void nfsd4_purge_closed_stateid(struct nfs4_stateowner *);