Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp5341999ybl; Tue, 10 Dec 2019 04:33:09 -0800 (PST) X-Google-Smtp-Source: APXvYqy7ZXe7vXnP0s4t8VQWMKNusIOALD4vzfVXrK8srofcv2EeL/Nx3ybdhVCUW0JPPLMzalpU X-Received: by 2002:a05:6830:114f:: with SMTP id x15mr24658698otq.291.1575981189329; Tue, 10 Dec 2019 04:33:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575981189; cv=none; d=google.com; s=arc-20160816; b=WqxTckGWqNxodDWy8Qo2Nkg3+hWSMG4efT72t3ngdAPs4dxv5CQRsPPSG9RvrtVGcY VDmpG3yX2kLTqi2VNiCpwqX/ZpOHrJl6M/5eZVaszzn7aFt3WL7ZHyZuvW82Wwno4ISx a8ufmv6xUAfkGFHL1B7te+V19v0uSK9x/rV/u6nVC7ws7Autiy5mz5xnZVpVilzrZnse qkObI0pXoSVs7bzFhlewx530Y0R2sUWYRDlAUr1wX2CSviHqS3sYFW5cpxyqbFUQ3ilh 4q64FhAbe3Vt5X0WuS2L/VXZmONiTkt0gZ5ac3pLzUKkxs49t8gMkxu+3gPD/Xw94o30 pSDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=H7RAmFZ02wbWW49ouv1oPyIzXMB87yUgwWLrN0yoU6w=; b=ysMj6yfiLro7fqWnxqxzs1O3D59InxzmJWZhrhENBSiDw2LL/T2qnQdvD9XmZ3z9gI u/EK0hGlxUMnvBxoAUngqtqUkov8GnTdUMAXnfk89wc6YMtMZH489t8v2fZUgJi/dowN y5y07J5VjLzjpTL++adRRztX4hBXcIMx4mtqjuVE0II2cbMsriJI+77YinT6tYbL5AuB POy7Q4x1mbksT567zEUiyWHIMCOjxfI24EAYerD0ZTUcFiZPB1yGxvC3+LXzr9eSEswD o2qd7YxPG+CyRud1y59I/lmplgIn7eIaDczkwFxiYHDpEnCJy1mHU40EUEkDjHnTQmUF BT8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OrS64Vf2; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (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 f194si1833551oig.243.2019.12.10.04.32.58; Tue, 10 Dec 2019 04:33:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OrS64Vf2; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727590AbfLJMbY (ORCPT + 99 others); Tue, 10 Dec 2019 07:31:24 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43977 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727500AbfLJMbX (ORCPT ); Tue, 10 Dec 2019 07:31:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575981082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H7RAmFZ02wbWW49ouv1oPyIzXMB87yUgwWLrN0yoU6w=; b=OrS64Vf2UJCKDDkxkZN7FTI+lzkzyO4Tn2af/kwD2WDiSjdrgQpMvQVZVUAwQy/dOyrnv/ RMuZZ/yQ+eIsYI5ug8uJoDWABomPqy7CAMnC6PfWATCLOEiU2ms74hCmCJ3SV4I+z83tCm LSzlmpCgUAm0dvYiAoGvitDgWfVCOOE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-285-k2ZS61UuOIieYAk1dsV5ag-1; Tue, 10 Dec 2019 07:31:18 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A88F107ACC5; Tue, 10 Dec 2019 12:31:17 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-123-90.rdu2.redhat.com [10.10.123.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 083606FEF3; Tue, 10 Dec 2019 12:31:17 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id C1E4B20C23; Tue, 10 Dec 2019 07:31:15 -0500 (EST) From: Scott Mayhew To: anna.schumaker@netapp.com, trond.myklebust@hammerspace.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, linux-security-module@vger.kernel.org Subject: [PATCH v6 11/27] nfs: unexport nfs_fs_mount_common() Date: Tue, 10 Dec 2019 07:30:59 -0500 Message-Id: <20191210123115.1655-12-smayhew@redhat.com> In-Reply-To: <20191210123115.1655-1-smayhew@redhat.com> References: <20191210123115.1655-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: k2ZS61UuOIieYAk1dsV5ag-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@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 e338558b7908..310f81a149b2 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -396,10 +396,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 nf= s_mount_info *); -struct dentry *nfs_fs_mount_common(int, const char *, struct nfs_mount_inf= o *); struct dentry *nfs_fs_mount(struct file_system_type *, int, const char *, = void *); -struct dentry * nfs_xdev_mount_common(struct file_system_type *, int, -=09=09const 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 60845dc864e7..0bedac041272 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1893,6 +1893,8 @@ static struct nfs_server *nfs_try_mount_request(struc= t nfs_mount_info *mount_inf =09return nfs_mod->rpc_ops->create_server(mount_info, nfs_mod); } =20 +static struct dentry *nfs_fs_mount_common(int, const char *, struct nfs_mo= unt_info *); + struct dentry *nfs_try_mount(int flags, const char *dev_name, =09=09=09 struct nfs_mount_info *mount_info) { @@ -2648,7 +2650,7 @@ static void nfs_set_readahead(struct backing_dev_info= *bdi, =09bdi->io_pages =3D iomax_pages; } =20 -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, =09=09=09=09 struct nfs_mount_info *mount_info) { =09struct super_block *s; @@ -2730,7 +2732,6 @@ struct dentry *nfs_fs_mount_common(int flags, const c= har *dev_name, =09deactivate_locked_super(s); =09goto out; } -EXPORT_SYMBOL_GPL(nfs_fs_mount_common); =20 struct dentry *nfs_fs_mount(struct file_system_type *fs_type, =09int flags, const char *dev_name, void *raw_data) --=20 2.17.2