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 13/27] nfs: get rid of mount_info ->fill_super()
Date: Wed, 20 Nov 2019 10:27:36 -0500 [thread overview]
Message-ID: <20191120152750.6880-14-smayhew@redhat.com> (raw)
In-Reply-To: <20191120152750.6880-1-smayhew@redhat.com>
From: Al Viro <viro@zeniv.linux.org.uk>
The only possible values are nfs_fill_super and nfs_clone_super. The
latter is used only when crossing into a submount and it is almost
identical to the former; the only differences are
* ->s_time_gran unconditionally set to 1 (even for v2 mounts).
Regression dating back to 2012, actually.
* ->s_blocksize/->s_blocksize_bits set to that of parent.
Rather than messing with the method, stash ->s_blocksize_bits in
mount_info in submount case and after the (now unconditional)
call of nfs_fill_super() override ->s_blocksize/->s_blocksize_bits
if that has been set.
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/nfs/internal.h | 4 +--
fs/nfs/namespace.c | 2 +-
fs/nfs/nfs4super.c | 1 -
fs/nfs/super.c | 75 ++++++++++------------------------------------
4 files changed, 18 insertions(+), 64 deletions(-)
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index e4f8a4734a2e..f64337a6d229 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -136,7 +136,7 @@ struct nfs_mount_request {
};
struct nfs_mount_info {
- void (*fill_super)(struct super_block *, struct nfs_mount_info *);
+ unsigned int inherited_bsize;
int (*set_security)(struct super_block *, struct dentry *, struct nfs_mount_info *);
struct nfs_parsed_mount_data *parsed;
struct nfs_clone_mount *cloned;
@@ -395,8 +395,6 @@ int nfs_set_sb_security(struct super_block *, struct dentry *, struct nfs_mount_
int nfs_clone_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);
struct dentry *nfs_fs_mount(struct file_system_type *, int, const char *, void *);
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 *);
extern struct rpc_stat nfs_rpcstat;
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index 970f92a860ed..7bc5b9b8f5ea 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -229,7 +229,7 @@ struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh,
.authflavor = authflavor,
};
struct nfs_mount_info mount_info = {
- .fill_super = nfs_clone_super,
+ .inherited_bsize = sb->s_blocksize_bits,
.set_security = nfs_clone_sb_security,
.cloned = &mountdata,
.mntfh = fh,
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index b6cf62125380..d387c3c3b600 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -224,7 +224,6 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type,
{
struct nfs_clone_mount *data = raw_data;
struct nfs_mount_info mount_info = {
- .fill_super = nfs_fill_super,
.set_security = nfs_clone_sb_security,
.cloned = data,
.nfs_mod = &nfs_v4,
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 691cd93c8a2f..d8b53fcaa60e 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2339,29 +2339,9 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
EXPORT_SYMBOL_GPL(nfs_remount);
/*
- * Initialise the common bits of the superblock
+ * Finish setting up an NFS superblock
*/
-static void nfs_initialise_sb(struct super_block *sb)
-{
- struct nfs_server *server = NFS_SB(sb);
-
- sb->s_magic = NFS_SUPER_MAGIC;
-
- /* We probably want something more informative here */
- snprintf(sb->s_id, sizeof(sb->s_id),
- "%u:%u", MAJOR(sb->s_dev), MINOR(sb->s_dev));
-
- if (sb->s_blocksize == 0)
- sb->s_blocksize = nfs_block_bits(server->wsize,
- &sb->s_blocksize_bits);
-
- nfs_super_set_maxbytes(sb, server->maxfilesize);
-}
-
-/*
- * Finish setting up an NFS2/3 superblock
- */
-void nfs_fill_super(struct super_block *sb, struct nfs_mount_info *mount_info)
+static void nfs_fill_super(struct super_block *sb, struct nfs_mount_info *mount_info)
{
struct nfs_parsed_mount_data *data = mount_info->parsed;
struct nfs_server *server = NFS_SB(sb);
@@ -2391,44 +2371,17 @@ void nfs_fill_super(struct super_block *sb, struct nfs_mount_info *mount_info)
sb->s_time_max = S64_MAX;
}
- nfs_initialise_sb(sb);
-}
-EXPORT_SYMBOL_GPL(nfs_fill_super);
-
-/*
- * Finish setting up a cloned NFS2/3/4 superblock
- */
-void nfs_clone_super(struct super_block *sb,
- struct nfs_mount_info *mount_info)
-{
- const struct super_block *old_sb = mount_info->cloned->sb;
- struct nfs_server *server = NFS_SB(sb);
-
- sb->s_blocksize_bits = old_sb->s_blocksize_bits;
- sb->s_blocksize = old_sb->s_blocksize;
- sb->s_maxbytes = old_sb->s_maxbytes;
- sb->s_xattr = old_sb->s_xattr;
- sb->s_op = old_sb->s_op;
- sb->s_export_op = old_sb->s_export_op;
+ sb->s_magic = NFS_SUPER_MAGIC;
- if (server->nfs_client->rpc_ops->version != 2) {
- /* The VFS shouldn't apply the umask to mode bits. We will do
- * so ourselves when necessary.
- */
- sb->s_flags |= SB_POSIXACL;
- sb->s_time_gran = 1;
- } else
- sb->s_time_gran = 1000;
+ /* We probably want something more informative here */
+ snprintf(sb->s_id, sizeof(sb->s_id),
+ "%u:%u", MAJOR(sb->s_dev), MINOR(sb->s_dev));
- if (server->nfs_client->rpc_ops->version != 4) {
- sb->s_time_min = 0;
- sb->s_time_max = U32_MAX;
- } else {
- sb->s_time_min = S64_MIN;
- sb->s_time_max = S64_MAX;
- }
+ if (sb->s_blocksize == 0)
+ sb->s_blocksize = nfs_block_bits(server->wsize,
+ &sb->s_blocksize_bits);
- nfs_initialise_sb(sb);
+ nfs_super_set_maxbytes(sb, server->maxfilesize);
}
static int nfs_compare_mount_options(const struct super_block *s, const struct nfs_server *b, int flags)
@@ -2701,8 +2654,13 @@ static struct dentry *nfs_fs_mount_common(int flags, const char *dev_name,
}
if (!s->s_root) {
+ unsigned bsize = mount_info->inherited_bsize;
/* initial superblock/root creation */
- mount_info->fill_super(s, mount_info);
+ nfs_fill_super(s, mount_info);
+ if (bsize) {
+ s->s_blocksize_bits = bsize;
+ s->s_blocksize = 1U << bsize;
+ }
nfs_get_cache_cookie(s, mount_info->parsed, mount_info->cloned);
if (!(server->flags & NFS_MOUNT_UNSHARED))
s->s_iflags |= SB_I_MULTIROOT;
@@ -2737,7 +2695,6 @@ struct dentry *nfs_fs_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *raw_data)
{
struct nfs_mount_info mount_info = {
- .fill_super = nfs_fill_super,
.set_security = nfs_set_sb_security,
};
struct dentry *mntroot = ERR_PTR(-ENOMEM);
--
2.17.2
next prev parent reply other threads:[~2019-11-20 15:29 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 ` [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 ` Scott Mayhew [this message]
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-14-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).