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 09/27] nfs: don't bother passing nfs_subversion to ->try_mount() and nfs_fs_mount_common()
Date: Wed, 20 Nov 2019 10:27:32 -0500 [thread overview]
Message-ID: <20191120152750.6880-10-smayhew@redhat.com> (raw)
In-Reply-To: <20191120152750.6880-1-smayhew@redhat.com>
From: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/nfs/internal.h | 6 ++----
fs/nfs/nfs4_fs.h | 2 +-
fs/nfs/nfs4super.c | 5 ++---
fs/nfs/super.c | 19 ++++++++-----------
include/linux/nfs_xdr.h | 3 +--
5 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index e7fd747d11a2..6a8296b4ccbe 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -393,12 +393,10 @@ extern struct file_system_type nfs_xdev_fs_type;
extern struct file_system_type nfs4_referral_fs_type;
#endif
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 *,
- struct nfs_subversion *);
+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 nfs_subversion *);
+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 *);
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 16b2e5cc3e94..784608d4982a 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -515,7 +515,7 @@ extern const nfs4_stateid invalid_stateid;
/* nfs4super.c */
struct nfs_mount_info;
extern struct nfs_subversion nfs_v4;
-struct dentry *nfs4_try_mount(int, const char *, struct nfs_mount_info *, struct nfs_subversion *);
+struct dentry *nfs4_try_mount(int, const char *, struct nfs_mount_info *);
extern bool nfs4_disable_idmapping;
extern unsigned short max_session_slots;
extern unsigned short max_session_cb_slots;
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 88d83cab8e9b..83bca2ea566c 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -98,7 +98,7 @@ static struct dentry *
nfs4_remote_mount(struct file_system_type *fs_type, int flags,
const char *dev_name, void *info)
{
- return nfs_fs_mount_common(flags, dev_name, info, &nfs_v4);
+ return nfs_fs_mount_common(flags, dev_name, info);
}
struct nfs_referral_count {
@@ -216,8 +216,7 @@ static struct dentry *do_nfs4_mount(struct nfs_server *server, int flags,
}
struct dentry *nfs4_try_mount(int flags, const char *dev_name,
- struct nfs_mount_info *mount_info,
- struct nfs_subversion *nfs_mod)
+ struct nfs_mount_info *mount_info)
{
struct nfs_parsed_mount_data *data = mount_info->parsed;
struct dentry *res;
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 20de67933527..5a21498da02e 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1893,15 +1893,15 @@ static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_inf
}
struct dentry *nfs_try_mount(int flags, const char *dev_name,
- struct nfs_mount_info *mount_info,
- struct nfs_subversion *nfs_mod)
+ struct nfs_mount_info *mount_info)
{
+ struct nfs_subversion *nfs_mod = mount_info->nfs_mod;
if (mount_info->parsed->need_mount)
mount_info->server = nfs_try_mount_request(mount_info, nfs_mod);
else
mount_info->server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
- return nfs_fs_mount_common(flags, dev_name, mount_info, nfs_mod);
+ return nfs_fs_mount_common(flags, dev_name, mount_info);
}
EXPORT_SYMBOL_GPL(nfs_try_mount);
@@ -2648,8 +2648,7 @@ static void nfs_set_readahead(struct backing_dev_info *bdi,
}
struct dentry *nfs_fs_mount_common(int flags, const char *dev_name,
- struct nfs_mount_info *mount_info,
- struct nfs_subversion *nfs_mod)
+ struct nfs_mount_info *mount_info)
{
struct super_block *s;
struct dentry *mntroot = ERR_PTR(-ENOMEM);
@@ -2677,7 +2676,8 @@ struct dentry *nfs_fs_mount_common(int flags, const char *dev_name,
sb_mntdata.mntflags |= SB_SYNCHRONOUS;
/* Get a superblock - note that we may end up sharing one that already exists */
- s = sget(nfs_mod->nfs_fs, compare_super, nfs_set_super, flags, &sb_mntdata);
+ s = sget(mount_info->nfs_mod->nfs_fs, compare_super, nfs_set_super,
+ flags, &sb_mntdata);
if (IS_ERR(s)) {
mntroot = ERR_CAST(s);
goto out_err_nosb;
@@ -2763,7 +2763,7 @@ struct dentry *nfs_fs_mount(struct file_system_type *fs_type,
}
mount_info.nfs_mod = nfs_mod;
- mntroot = nfs_mod->rpc_ops->try_mount(flags, dev_name, &mount_info, nfs_mod);
+ mntroot = nfs_mod->rpc_ops->try_mount(flags, dev_name, &mount_info);
put_nfs_version(nfs_mod);
out:
@@ -2797,10 +2797,7 @@ static struct dentry *
nfs_xdev_mount(struct file_system_type *fs_type, int flags,
const char *dev_name, void *raw_data)
{
- struct nfs_mount_info *info = raw_data;
- struct nfs_subversion *nfs_mod = NFS_SB(info->cloned->sb)->nfs_client->cl_nfs_mod;
-
- return nfs_fs_mount_common(flags, dev_name, info, nfs_mod);
+ return nfs_fs_mount_common(flags, dev_name, raw_data);
}
#if IS_ENABLED(CONFIG_NFS_V4)
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 9b8324ec08f3..4fdf4a523185 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1638,8 +1638,7 @@ struct nfs_rpc_ops {
struct nfs_fsinfo *);
struct vfsmount *(*submount) (struct nfs_server *, struct dentry *,
struct nfs_fh *, struct nfs_fattr *);
- struct dentry *(*try_mount) (int, const char *, struct nfs_mount_info *,
- struct nfs_subversion *);
+ struct dentry *(*try_mount) (int, const char *, struct nfs_mount_info *);
int (*getattr) (struct nfs_server *, struct nfs_fh *,
struct nfs_fattr *, struct nfs4_label *,
struct inode *);
--
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 ` Scott Mayhew [this message]
2019-11-20 15:27 ` [PATCH v5 10/27] nfs: merge xdev and remote file_system_type Scott Mayhew
2019-11-20 15:27 ` [PATCH v5 11/27] nfs: unexport nfs_fs_mount_common() Scott Mayhew
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-10-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).