From: Scott Mayhew <smayhew@redhat.com>
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
Subject: [PATCH v5 11/27] nfs: unexport nfs_fs_mount_common()
Date: Wed, 20 Nov 2019 10:27:34 -0500 [thread overview]
Message-ID: <20191120152750.6880-12-smayhew@redhat.com> (raw)
In-Reply-To: <20191120152750.6880-1-smayhew@redhat.com>
From: Al Viro <viro@zeniv.linux.org.uk>
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 <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
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 8f64f2fcc430..dc896602d588 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 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 6a27bd501f3f..1587c505cc23 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)
{
@@ -2648,7 +2650,7 @@ static void nfs_set_readahead(struct backing_dev_info *bdi,
bdi->io_pages = iomax_pages;
}
-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;
@@ -2730,7 +2732,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
next prev parent reply other threads:[~2019-11-20 15:30 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 15:27 [PATCH v5 00/27] nfs: Mount API conversion Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 01/27] saner calling conventions for nfs_fs_mount_common() Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 02/27] nfs: stash server into struct nfs_mount_info Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 03/27] nfs: lift setting mount_info from nfs4_remote{,_referral}_mount Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 04/27] nfs: fold nfs4_remote_fs_type and nfs4_remote_referral_fs_type Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 05/27] nfs: don't bother setting/restoring export_path around do_nfs_root_mount() Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 06/27] nfs4: fold nfs_do_root_mount/nfs_follow_remote_path Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 07/27] nfs: lift setting mount_info from nfs_xdev_mount() Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 08/27] nfs: stash nfs_subversion reference into nfs_mount_info Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 09/27] nfs: don't bother passing nfs_subversion to ->try_mount() and nfs_fs_mount_common() Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 10/27] nfs: merge xdev and remote file_system_type Scott Mayhew
2019-11-20 15:27 ` Scott Mayhew [this message]
2019-11-20 15:27 ` [PATCH v5 12/27] nfs: don't pass nfs_subversion to ->create_server() Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 13/27] nfs: get rid of mount_info ->fill_super() Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 14/27] nfs_clone_sb_security(): simplify the check for server bogosity Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 15/27] nfs: get rid of ->set_security() Scott Mayhew
2019-11-21 5:52 ` James Morris
2019-11-20 15:27 ` [PATCH v5 16/27] NFS: Move mount parameterisation bits into their own file Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 17/27] NFS: Constify mount argument match tables Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 18/27] NFS: Rename struct nfs_parsed_mount_data to struct nfs_fs_context Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 19/27] NFS: Split nfs_parse_mount_options() Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 20/27] NFS: Deindent nfs_fs_context_parse_option() Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 21/27] NFS: Add a small buffer in nfs_fs_context to avoid string dup Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 22/27] NFS: Do some tidying of the parsing code Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 23/27] NFS: rename nfs_fs_context pointer arg in a few functions Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 24/27] NFS: Convert mount option parsing to use functionality from fs_parser.h Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 25/27] NFS: Add fs_context support Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 26/27] NFS: Additional refactoring for fs_context conversion Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 27/27] NFS: Attach supplementary error information to fs_context Scott Mayhew
2019-12-06 14:39 ` [PATCH v5 00/27] nfs: Mount API conversion Scott Mayhew
2019-12-06 19:58 ` Schumaker, Anna
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191120152750.6880-12-smayhew@redhat.com \
--to=smayhew@redhat.com \
--cc=anna.schumaker@netapp.com \
--cc=dhowells@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).