Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp2478877ybe; Tue, 3 Sep 2019 13:34:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqygDQotUuq+IiONb1L40/RQSz32862Qr34t8vijouLLKe5PDXLjYeZj4KuepSCYePiDMQ2H X-Received: by 2002:a17:902:e489:: with SMTP id cj9mr37830812plb.327.1567542849582; Tue, 03 Sep 2019 13:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567542849; cv=none; d=google.com; s=arc-20160816; b=NP5x3/PmS9IlFIP2mN3NlVVP5lYnkt1BdAfXTuyr4NFatwsoBH80Ih2gRGwcE4rdJr 9BVz3BdVzOUwef97Kk7IqKSVimm7HO6aJud+yMLJmXFONBlTYhWezM2UzWg+KGixEr/j 3o3ltXRi0yfHxW5upcX6BBNit8ExrzZR/dQ8BkHHt3Nui88v1erzouAVo7camf/OKe4g P12HKVELDxC4pVb39xPJupWYsJgKgIkVwFu8oGhUdAzWvimHsBMO7jJYUhLrM0zCQivY IwkyKC7m90y8nn/Ux709eKNr33gYnGSYIPRGFgoiT9eBFf8dzBAoLbzejyvocwSRRsMd YS0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=G3IcMR4hs6i1Lb08Rbs+7hJ4lr/RwftYvnZffE38G7c=; b=Agn/6FfdMF+mvECW0UFIpJyLyO8E7a5n2RsM51m1Ffc4giSEeKyudGdI1God5+TDbg JdgY3O8zdxW7QOqGStFKQ9m5gmZ5ffrUxUmbrM0DzTCsgzK1AncHayd0SPUN8Dl+wjgd 6FFgCC9w/rKSpouYWEsUZ8IoX+cYfQra6ctUS9Lh7gabMTSCl0ngSJZFxCyQXIYyZJqx dXefwsqFEm+/zziMSCKwun8+t99xDAQeppAZBNxbbd/wHODqjs5v8Yrqtb01IHAjEnQU NBXQKWrMlMj68EcSPqAVOfedmPflI83sBEj43Y5V/oC2Ise465v42C+Y9hjXad8vjDQj h3mA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 98si3965739plb.281.2019.09.03.13.33.54; Tue, 03 Sep 2019 13:34:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727346AbfICUcT (ORCPT + 99 others); Tue, 3 Sep 2019 16:32:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43526 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726980AbfICUcR (ORCPT ); Tue, 3 Sep 2019 16:32:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1C5311026FEA; Tue, 3 Sep 2019 20:32:17 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-121-35.rdu2.redhat.com [10.10.121.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA3AB6012C; Tue, 3 Sep 2019 20:32:16 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id A519120CEB; Tue, 3 Sep 2019 16:32:15 -0400 (EDT) From: Scott Mayhew To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com Cc: dhowells@redhat.com, viro@zeniv.linux.org.uk, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 11/26] nfs: unexport nfs_fs_mount_common() Date: Tue, 3 Sep 2019 16:32:00 -0400 Message-Id: <20190903203215.9157-12-smayhew@redhat.com> In-Reply-To: <20190903203215.9157-1-smayhew@redhat.com> References: <20190903203215.9157-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 03 Sep 2019 20:32:17 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro Make it static, even. And remove a stale extern of (long-gone) nfs_xdev_mount_common() from internal.h, while we are at it. Reviewed-by: David Howells Signed-off-by: Al Viro --- fs/nfs/internal.h | 3 --- fs/nfs/super.c | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index ac3478827a83..207d1574e246 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -404,10 +404,7 @@ bool nfs_auth_info_match(const struct nfs_auth_info *, rpc_authflavor_t); struct dentry *nfs_try_mount(int, const char *, struct nfs_mount_info *); int nfs_set_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *); int nfs_clone_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *); -struct dentry *nfs_fs_mount_common(int, const char *, struct nfs_mount_info *); struct dentry *nfs_fs_mount(struct file_system_type *, int, const char *, void *); -struct dentry * nfs_xdev_mount_common(struct file_system_type *, int, - const char *, struct nfs_mount_info *); void nfs_kill_super(struct super_block *); void nfs_fill_super(struct super_block *, struct nfs_mount_info *); void nfs_clone_super(struct super_block *, struct nfs_mount_info *); diff --git a/fs/nfs/super.c b/fs/nfs/super.c index d80992d2b6fe..c3ee83c17f07 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1893,6 +1893,8 @@ static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_inf return nfs_mod->rpc_ops->create_server(mount_info, nfs_mod); } +static struct dentry *nfs_fs_mount_common(int, const char *, struct nfs_mount_info *); + struct dentry *nfs_try_mount(int flags, const char *dev_name, struct nfs_mount_info *mount_info) { @@ -2623,7 +2625,7 @@ int nfs_clone_sb_security(struct super_block *s, struct dentry *mntroot, } EXPORT_SYMBOL_GPL(nfs_clone_sb_security); -struct dentry *nfs_fs_mount_common(int flags, const char *dev_name, +static struct dentry *nfs_fs_mount_common(int flags, const char *dev_name, struct nfs_mount_info *mount_info) { struct super_block *s; @@ -2705,7 +2707,6 @@ struct dentry *nfs_fs_mount_common(int flags, const char *dev_name, deactivate_locked_super(s); goto out; } -EXPORT_SYMBOL_GPL(nfs_fs_mount_common); struct dentry *nfs_fs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *raw_data) -- 2.17.2