From patchwork Thu Mar 10 00:19:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 623001 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2A0JTpN008045 for ; Thu, 10 Mar 2011 00:19:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753143Ab1CJATa (ORCPT ); Wed, 9 Mar 2011 19:19:30 -0500 Received: from mx2.netapp.com ([216.240.18.37]:2867 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752884Ab1CJAT3 (ORCPT ); Wed, 9 Mar 2011 19:19:29 -0500 X-IronPort-AV: E=Sophos;i="4.62,293,1297065600"; d="scan'208";a="528372352" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 09 Mar 2011 16:19:27 -0800 Received: from heimdal.trondhjem.org.com (san-lxp.hq.netapp.com [10.58.56.108] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p2A0JObV015239; Wed, 9 Mar 2011 16:19:27 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 4/4] NFSv4: nfs4_state_mark_reclaim_nograce() should be static Date: Wed, 9 Mar 2011 19:19:19 -0500 Message-Id: <1299716359-30977-4-git-send-email-Trond.Myklebust@netapp.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1299716359-30977-3-git-send-email-Trond.Myklebust@netapp.com> References: <1299716359-30977-1-git-send-email-Trond.Myklebust@netapp.com> <1299716359-30977-2-git-send-email-Trond.Myklebust@netapp.com> <1299716359-30977-3-git-send-email-Trond.Myklebust@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 10 Mar 2011 00:19:31 +0000 (UTC) diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 42884b3..560ebde 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -315,8 +315,6 @@ extern void nfs4_state_set_mode_locked(struct nfs4_state *, fmode_t); extern void nfs4_schedule_lease_recovery(struct nfs_client *); extern void nfs4_schedule_state_manager(struct nfs_client *); extern void nfs4_schedule_stateid_recovery(const struct nfs_server *, struct nfs4_state *); -extern int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state); -extern int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_state *state); extern void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags); extern void nfs41_handle_recall_slot(struct nfs_client *clp); extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp); diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 47c8dcd..0592288 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1018,7 +1018,7 @@ void nfs4_schedule_lease_recovery(struct nfs_client *clp) nfs4_schedule_state_manager(clp); } -int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_state *state) +static int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_state *state) { set_bit(NFS_STATE_RECLAIM_REBOOT, &state->flags); @@ -1032,7 +1032,7 @@ int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_state *st return 1; } -int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state) +static int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state) { set_bit(NFS_STATE_RECLAIM_NOGRACE, &state->flags); clear_bit(NFS_STATE_RECLAIM_REBOOT, &state->flags);