From patchwork Fri Jul 10 20:58:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 6768681 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4626A9F319 for ; Fri, 10 Jul 2015 21:00:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 66A3E207A4 for ; Fri, 10 Jul 2015 20:59:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EDBB207A0 for ; Fri, 10 Jul 2015 20:59:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933278AbbGJU74 (ORCPT ); Fri, 10 Jul 2015 16:59:56 -0400 Received: from mx141.netapp.com ([216.240.21.12]:30938 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933170AbbGJU7N (ORCPT ); Fri, 10 Jul 2015 16:59:13 -0400 X-IronPort-AV: E=Sophos;i="5.15,449,1432623600"; d="scan'208";a="55889070" Received: from vmwexchts01-prd.hq.netapp.com ([10.122.105.12]) by mx141-out.netapp.com with ESMTP; 10 Jul 2015 13:59:12 -0700 Received: from smtp1.corp.netapp.com (10.57.156.124) by VMWEXCHTS01-PRD.hq.netapp.com (10.122.105.12) with Microsoft SMTP Server id 15.0.1076.9; Fri, 10 Jul 2015 13:59:12 -0700 Received: from davros.com ([10.63.224.59]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id t6AKwW4N005098; Fri, 10 Jul 2015 13:59:11 -0700 (PDT) From: Anna Schumaker To: , CC: Subject: [PATCH 6/9] NFS: Remove nfs4_match_stateid() Date: Fri, 10 Jul 2015 16:58:14 -0400 Message-ID: <1436561897-8051-7-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1436561897-8051-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1436561897-8051-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Let's just call nfs4_stateid_match() directly. Signed-off-by: Anna Schumaker Reviewed-by: Christoph Hellwig --- 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,