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,
linux-security-module@vger.kernel.org
Subject: [PATCH v6 02/27] nfs: stash server into struct nfs_mount_info
Date: Tue, 10 Dec 2019 07:30:50 -0500 [thread overview]
Message-ID: <20191210123115.1655-3-smayhew@redhat.com> (raw)
In-Reply-To: <20191210123115.1655-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 | 3 ++-
fs/nfs/nfs4super.c | 10 ++++------
fs/nfs/super.c | 19 ++++++++-----------
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 24a65da58aa9..8f4900bd04f7 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -142,6 +142,7 @@ struct nfs_mount_info {
int (*set_security)(struct super_block *, struct dentry *, struct nfs_mount_info *);
struct nfs_parsed_mount_data *parsed;
struct nfs_clone_mount *cloned;
+ struct nfs_server *server;
struct nfs_fh *mntfh;
};
@@ -397,7 +398,7 @@ struct dentry *nfs_try_mount(int, const char *, struct nfs_mount_info *,
struct nfs_subversion *);
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(struct nfs_server *, int, const char *,
+struct dentry *nfs_fs_mount_common(int, const char *,
struct nfs_mount_info *, struct nfs_subversion *);
struct dentry *nfs_fs_mount(struct file_system_type *, int, const char *, void *);
struct dentry * nfs_xdev_mount_common(struct file_system_type *, int,
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index beeaed872e6c..e7f2fd1925b1 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -109,13 +109,12 @@ nfs4_remote_mount(struct file_system_type *fs_type, int flags,
const char *dev_name, void *info)
{
struct nfs_mount_info *mount_info = info;
- struct nfs_server *server;
mount_info->set_security = nfs_set_sb_security;
/* Get a volume representation */
- server = nfs4_create_server(mount_info, &nfs_v4);
- return nfs_fs_mount_common(server, flags, dev_name, mount_info, &nfs_v4);
+ mount_info->server = nfs4_create_server(mount_info, &nfs_v4);
+ return nfs_fs_mount_common(flags, dev_name, mount_info, &nfs_v4);
}
static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type,
@@ -260,7 +259,6 @@ nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags,
.set_security = nfs_clone_sb_security,
.cloned = raw_data,
};
- struct nfs_server *server;
struct dentry *mntroot = ERR_PTR(-ENOMEM);
dprintk("--> nfs4_referral_get_sb()\n");
@@ -270,8 +268,8 @@ nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags,
goto out;
/* create a new volume representation */
- server = nfs4_create_referral_server(mount_info.cloned, mount_info.mntfh);
- mntroot = nfs_fs_mount_common(server, flags, dev_name, &mount_info, &nfs_v4);
+ mount_info.server = nfs4_create_referral_server(mount_info.cloned, mount_info.mntfh);
+ mntroot = nfs_fs_mount_common(flags, dev_name, &mount_info, &nfs_v4);
out:
nfs_free_fhandle(mount_info.mntfh);
return mntroot;
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f074c3773f0e..379c7b26051d 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1896,14 +1896,12 @@ struct dentry *nfs_try_mount(int flags, const char *dev_name,
struct nfs_mount_info *mount_info,
struct nfs_subversion *nfs_mod)
{
- struct nfs_server *server;
-
if (mount_info->parsed->need_mount)
- server = nfs_try_mount_request(mount_info, nfs_mod);
+ mount_info->server = nfs_try_mount_request(mount_info, nfs_mod);
else
- server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
+ mount_info->server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
- return nfs_fs_mount_common(server, flags, dev_name, mount_info, nfs_mod);
+ return nfs_fs_mount_common(flags, dev_name, mount_info, nfs_mod);
}
EXPORT_SYMBOL_GPL(nfs_try_mount);
@@ -2649,20 +2647,21 @@ static void nfs_set_readahead(struct backing_dev_info *bdi,
bdi->io_pages = iomax_pages;
}
-struct dentry *nfs_fs_mount_common(struct nfs_server *server,
- int flags, const char *dev_name,
+struct dentry *nfs_fs_mount_common(int flags, const char *dev_name,
struct nfs_mount_info *mount_info,
struct nfs_subversion *nfs_mod)
{
struct super_block *s;
struct dentry *mntroot = ERR_PTR(-ENOMEM);
int (*compare_super)(struct super_block *, void *) = nfs_compare_super;
+ struct nfs_server *server = mount_info->server;
struct nfs_sb_mountdata sb_mntdata = {
.mntflags = flags,
.server = server,
};
int error;
+ mount_info->server = NULL;
if (IS_ERR(server))
return ERR_CAST(server);
@@ -2803,7 +2802,6 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags,
.set_security = nfs_clone_sb_security,
.cloned = data,
};
- struct nfs_server *server;
struct dentry *mntroot = ERR_PTR(-ENOMEM);
struct nfs_subversion *nfs_mod = NFS_SB(data->sb)->nfs_client->cl_nfs_mod;
@@ -2812,10 +2810,9 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags,
mount_info.mntfh = mount_info.cloned->fh;
/* create a new volume representation */
- server = nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);
+ mount_info.server = nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);
- mntroot = nfs_fs_mount_common(server, flags,
- dev_name, &mount_info, nfs_mod);
+ mntroot = nfs_fs_mount_common(flags, dev_name, &mount_info, nfs_mod);
dprintk("<-- nfs_xdev_mount() = %ld\n",
IS_ERR(mntroot) ? PTR_ERR(mntroot) : 0L);
--
2.17.2
next prev parent reply other threads:[~2019-12-10 12:32 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 12:30 [PATCH v6 00/27] nfs: Mount API conversion Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 01/27] saner calling conventions for nfs_fs_mount_common() Scott Mayhew
2019-12-10 12:30 ` Scott Mayhew [this message]
2019-12-10 12:30 ` [PATCH v6 03/27] nfs: lift setting mount_info from nfs4_remote{,_referral}_mount Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 04/27] nfs: fold nfs4_remote_fs_type and nfs4_remote_referral_fs_type Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 05/27] nfs: don't bother setting/restoring export_path around do_nfs_root_mount() Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 06/27] nfs4: fold nfs_do_root_mount/nfs_follow_remote_path Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 07/27] nfs: lift setting mount_info from nfs_xdev_mount() Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 08/27] nfs: stash nfs_subversion reference into nfs_mount_info Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 09/27] nfs: don't bother passing nfs_subversion to ->try_mount() and nfs_fs_mount_common() Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 10/27] nfs: merge xdev and remote file_system_type Scott Mayhew
2019-12-10 12:30 ` [PATCH v6 11/27] nfs: unexport nfs_fs_mount_common() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 12/27] nfs: don't pass nfs_subversion to ->create_server() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 13/27] nfs: get rid of mount_info ->fill_super() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 14/27] nfs_clone_sb_security(): simplify the check for server bogosity Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 15/27] nfs: get rid of ->set_security() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 16/27] NFS: Move mount parameterisation bits into their own file Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 17/27] NFS: Constify mount argument match tables Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 18/27] NFS: Rename struct nfs_parsed_mount_data to struct nfs_fs_context Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 19/27] NFS: Split nfs_parse_mount_options() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 20/27] NFS: Deindent nfs_fs_context_parse_option() Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 21/27] NFS: Add a small buffer in nfs_fs_context to avoid string dup Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 22/27] NFS: Do some tidying of the parsing code Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 23/27] NFS: rename nfs_fs_context pointer arg in a few functions Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 24/27] NFS: Convert mount option parsing to use functionality from fs_parser.h Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 25/27] NFS: Add fs_context support Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 26/27] NFS: Additional refactoring for fs_context conversion Scott Mayhew
2019-12-10 12:31 ` [PATCH v6 27/27] NFS: Attach supplementary error information to fs_context Scott Mayhew
2019-12-10 21:16 ` [PATCH v6 00/27] nfs: Mount API conversion Schumaker, Anna
2019-12-11 13:21 ` Scott Mayhew
2019-12-13 21:39 ` Scott Mayhew
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=20191210123115.1655-3-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=linux-security-module@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).