From patchwork Thu Sep 24 12:55:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 7256431 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 E032F9F30C for ; Thu, 24 Sep 2015 12:56:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0599A207C6 for ; Thu, 24 Sep 2015 12:56:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C95C207BF for ; Thu, 24 Sep 2015 12:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753995AbbIXM4M (ORCPT ); Thu, 24 Sep 2015 08:56:12 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:34755 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753148AbbIXM4L (ORCPT ); Thu, 24 Sep 2015 08:56:11 -0400 Received: by padhy16 with SMTP id hy16so72813105pad.1 for ; Thu, 24 Sep 2015 05:56:11 -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=VC39elOVB9If+Xjq8h91RGKI3nVqUE60aSNIQuAsLHg=; b=JYFOWgtUlB9MV0NGt24vPzaqSxN58xSHfLaL7zWIqNvssmpxxlGw1QYZjoIzP605sY cETk9pMyXTcJEzxZ10A6fJfsnnVeqhx85+lN+rTIEPqN45DMJ++ec1tPq70cqgrcbxu1 Pb2X+mNkIpMmJe/f4wZdAt1Wfd9Bo2DR1CmxbhZRcctn37Js1mmWxeW3moyygphJWTAK Hbqgjwi0crD6cHbLTgovKox8m/l/agbKMX0j11AciLr3SdOisjzE1ueN9g6aBzG7WaxW IJkqJXI3vP61uXWazrcmtWsl1aTrKHX/QHy9GtpksTDcOG59D81HNonHLcug8+6cdLMi 35Bg== X-Received: by 10.68.194.73 with SMTP id hu9mr45633574pbc.146.1443099370992; Thu, 24 Sep 2015 05:56:10 -0700 (PDT) Received: from [192.168.99.26] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id fx4sm13569450pbb.92.2015.09.24.05.56.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 05:56:10 -0700 (PDT) Subject: [PATCH 2/8] NFS: Remove the left global variable nfs_callback_tcpport To: Trond Myklebust References: <5603F269.9060102@gmail.com> Cc: "linux-nfs@vger.kernel.org" , kinglongmee@gmail.com From: Kinglong Mee Message-ID: <5603F2DF.4090407@gmail.com> Date: Thu, 24 Sep 2015 20:55:59 +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 bbe0a3aa4e22 "NFS: make nfs_callback_tcpport per network context" has make nfs_callback_tcpport per network, but left the global nfs_callback_tcpport, remove it. Signed-off-by: Kinglong Mee --- fs/nfs/callback.h | 1 - fs/nfs/super.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h index 0a590f0..cbcc903 100644 --- a/fs/nfs/callback.h +++ b/fs/nfs/callback.h @@ -204,6 +204,5 @@ extern int nfs4_set_callback_sessionid(struct nfs_client *clp); #define NFS41_BC_MAX_CALLBACKS 1 extern unsigned int nfs_callback_set_tcpport; -extern unsigned short nfs_callback_tcpport; #endif /* __LINUX_FS_NFS_CALLBACK_H */ diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 383a027..f126828 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2816,7 +2816,6 @@ out_invalid_transport_udp: * NFS client for backwards compatibility */ unsigned int nfs_callback_set_tcpport; -unsigned short nfs_callback_tcpport; /* Default cache timeout is 10 minutes */ unsigned int nfs_idmap_cache_timeout = 600; /* Turn off NFSv4 uid/gid mapping when using AUTH_SYS */ @@ -2827,7 +2826,6 @@ char nfs4_client_id_uniquifier[NFS4_CLIENT_ID_UNIQ_LEN] = ""; bool recover_lost_locks = false; EXPORT_SYMBOL_GPL(nfs_callback_set_tcpport); -EXPORT_SYMBOL_GPL(nfs_callback_tcpport); EXPORT_SYMBOL_GPL(nfs_idmap_cache_timeout); EXPORT_SYMBOL_GPL(nfs4_disable_idmapping); EXPORT_SYMBOL_GPL(max_session_slots);