From patchwork Thu Sep 24 12:56:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 7256441 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 C05309F30C for ; Thu, 24 Sep 2015 12:56:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E8AEB2082E for ; Thu, 24 Sep 2015 12:56:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E370D20812 for ; Thu, 24 Sep 2015 12:56:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753419AbbIXM4l (ORCPT ); Thu, 24 Sep 2015 08:56:41 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35322 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753148AbbIXM4k (ORCPT ); Thu, 24 Sep 2015 08:56:40 -0400 Received: by pacfv12 with SMTP id fv12so73893746pac.2 for ; Thu, 24 Sep 2015 05:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=mx5leGmDcbF0hEOGdFSmrQ095OwAlMfAu28MWSQgsKg=; b=tA6tdGsfLTwYCq8xwXDyz3NbvFgEw+vXHxpDJqUUxe5Ofj0LUpMya0SkOSi9WqvNym kPU9N1f8143XnYgpBNOCMtSGLspPwTCOytbuFl18dp2g9+7sa/24yLCAEbZkxNbsI5c/ kTb4Id8IATJkuqLRhkCfxXAXIr586sOZJMt4EJbKkhD0IvSxn82lM+XXtdwIVf0OmsbH UyCAfLa0BZd0FY7xvco8zpkWhreUdyF1BRPmmH5P97boMCfZ/GP9QjZIguMFKcwFpwVE 9UwbR7kO89MDqWUBDepQ2roiJfMiWlceL3QGy/AfTv9uNKTYT+89YSxII9iuRKWExw5I CyXQ== X-Received: by 10.68.235.99 with SMTP id ul3mr45090473pbc.138.1443099400351; Thu, 24 Sep 2015 05:56:40 -0700 (PDT) Received: from [192.168.99.26] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id hh3sm13680249pbc.8.2015.09.24.05.56.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 05:56:39 -0700 (PDT) Subject: [PATCH 3/8] NFS: Remove the left function defines in callback.h To: Trond Myklebust References: <5603F269.9060102@gmail.com> Cc: "linux-nfs@vger.kernel.org" , kinglongmee@gmail.com From: Kinglong Mee Message-ID: <5603F2FD.1010601@gmail.com> Date: Thu, 24 Sep 2015 20:56:29 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <5603F269.9060102@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 Commit 778be232a207 "NFS do not find client in NFSv4 pg_authenticate" has remove the define and using of nfs4_set_callback_sessionid(), and commit 36281caa839f "NFSv4: Further clean-ups of delegation stateid validation" has update the checking of stateid, and move the code to nfs4proc.c. This patch remove those function defines left in callback.h Signed-off-by: Kinglong Mee --- fs/nfs/callback.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h index cbcc903..ff8195b 100644 --- a/fs/nfs/callback.h +++ b/fs/nfs/callback.h @@ -117,9 +117,6 @@ extern __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, struct cb_sequenceres *res, struct cb_process_state *cps); -extern int nfs41_validate_delegation_stateid(struct nfs_delegation *delegation, - const nfs4_stateid *stateid); - #define RCA4_TYPE_MASK_RDATA_DLG 0 #define RCA4_TYPE_MASK_WDATA_DLG 1 #define RCA4_TYPE_MASK_DIR_DLG 2 @@ -191,9 +188,6 @@ extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy, #if IS_ENABLED(CONFIG_NFS_V4) extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt); extern void nfs_callback_down(int minorversion, struct net *net); -extern int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation, - const nfs4_stateid *stateid); -extern int nfs4_set_callback_sessionid(struct nfs_client *clp); #endif /* CONFIG_NFS_V4 */ /* * nfs41: Callbacks are expected to not cause substantial latency,