Return-Path: Received: from mx143.netapp.com ([216.240.21.24]:33030 "EHLO mx143.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751507AbbGMSCx (ORCPT ); Mon, 13 Jul 2015 14:02:53 -0400 From: Anna Schumaker To: , CC: Subject: [PATCH v2 07/10] NFS: Remove nfs4_match_stateid() Date: Mon, 13 Jul 2015 14:01:30 -0400 Message-ID: <1436810493-22806-8-git-send-email-Anna.Schumaker@Netapp.com> In-Reply-To: <1436810493-22806-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1436810493-22806-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-nfs-owner@vger.kernel.org List-ID: Let's just call nfs4_stateid_match() directly. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6f228b5..b911fb0 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8514,12 +8514,6 @@ static bool nfs41_match_stateid(const nfs4_stateid *s1, #endif /* CONFIG_NFS_V4_1 */ -static bool nfs4_match_stateid(const nfs4_stateid *s1, - const nfs4_stateid *s2) -{ - return nfs4_stateid_match(s1, s2); -} - static const struct nfs4_state_recovery_ops nfs40_reboot_recovery_ops = { .owner_flag_bit = NFS_OWNER_RECLAIM_REBOOT, @@ -8594,7 +8588,7 @@ static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = { | NFS_CAP_POSIX_LOCK, .init_client = nfs40_init_client, .shutdown_client = nfs40_shutdown_client, - .match_stateid = nfs4_match_stateid, + .match_stateid = nfs4_stateid_match, .find_root_sec = nfs4_find_root_sec, .free_lock_state = nfs4_release_lockowner, .alloc_seqid = nfs_alloc_seqid, -- 2.4.5