From: Ian Kent <raven@themaw.net>
To: linux-xfs <linux-xfs@vger.kernel.org>
Cc: Brian Foster <bfoster@redhat.com>,
Eric Sandeen <sandeen@sandeen.net>,
David Howells <dhowells@redhat.com>,
Dave Chinner <dchinner@redhat.com>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: [PATCH v4 09/17] xfs: mount-api - refactor xfs_fs_fill_super()
Date: Thu, 03 Oct 2019 18:26:06 +0800 [thread overview]
Message-ID: <157009836693.13858.2543927672631996230.stgit@fedora-28> (raw)
In-Reply-To: <157009817203.13858.7783767645177567968.stgit@fedora-28>
Much of the code in xfs_fs_fill_super() will be used by the fill super
function of the new mount-api.
So refactor the common code into a helper in an attempt to show what's
actually changed.
Signed-off-by: Ian Kent <raven@themaw.net>
Reviewed-by: Brian Foster <bfoster@redhat.com>
---
fs/xfs/xfs_super.c | 64 +++++++++++++++++++++++++++++++++-------------------
1 file changed, 41 insertions(+), 23 deletions(-)
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 7008355df065..cc2da9093e34 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1712,27 +1712,14 @@ xfs_mount_alloc(
STATIC int
-xfs_fs_fill_super(
- struct super_block *sb,
- void *data,
+__xfs_fs_fill_super(
+ struct xfs_mount *mp,
int silent)
{
+ struct super_block *sb = mp->m_super;
struct inode *root;
- struct xfs_mount *mp = NULL;
- int flags = 0, error = -ENOMEM;
-
- /*
- * allocate mp and do all low-level struct initializations before we
- * attach it to the super
- */
- mp = xfs_mount_alloc(sb);
- if (!mp)
- goto out;
- sb->s_fs_info = mp;
-
- error = xfs_parseargs(mp, (char *)data);
- if (error)
- goto out_free_fsname;
+ int flags = 0;
+ int error;
sb_min_blocksize(sb, BBSIZE);
sb->s_xattr = xfs_xattr_handlers;
@@ -1759,7 +1746,7 @@ xfs_fs_fill_super(
error = xfs_open_devices(mp);
if (error)
- goto out_free_fsname;
+ goto out;
error = xfs_init_mount_workqueues(mp);
if (error)
@@ -1894,10 +1881,6 @@ xfs_fs_fill_super(
xfs_destroy_mount_workqueues(mp);
out_close_devices:
xfs_close_devices(mp);
- out_free_fsname:
- sb->s_fs_info = NULL;
- xfs_free_fsname(mp);
- kfree(mp);
out:
return error;
@@ -1907,6 +1890,41 @@ xfs_fs_fill_super(
goto out_free_sb;
}
+STATIC int
+xfs_fs_fill_super(
+ struct super_block *sb,
+ void *data,
+ int silent)
+{
+ struct xfs_mount *mp;
+ int error;
+
+ /*
+ * allocate mp and do all low-level struct initializations before we
+ * attach it to the super
+ */
+ mp = xfs_mount_alloc(sb);
+ if (!mp)
+ return -ENOMEM;
+ sb->s_fs_info = mp;
+
+ error = xfs_parseargs(mp, (char *)data);
+ if (error)
+ goto out_free_fsname;
+
+ error = __xfs_fs_fill_super(mp, silent);
+ if (error)
+ goto out_free_fsname;
+
+ return 0;
+
+ out_free_fsname:
+ sb->s_fs_info = NULL;
+ xfs_free_fsname(mp);
+ kfree(mp);
+ return error;
+}
+
STATIC void
xfs_fs_put_super(
struct super_block *sb)
next prev parent reply other threads:[~2019-10-03 10:26 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 10:25 [PATCH v4 00/17] xfs: mount API patch series Ian Kent
2019-10-03 10:25 ` [PATCH v4 01/17] vfs: Create fs_context-aware mount_bdev() replacement Ian Kent
2019-10-03 10:25 ` [PATCH v4 02/17] vfs: add missing blkdev_put() in get_tree_bdev() Ian Kent
2019-10-03 14:56 ` Darrick J. Wong
2019-10-04 6:49 ` Ian Kent
2019-10-04 6:59 ` Ian Kent
2019-10-04 12:25 ` Al Viro
2019-10-03 10:25 ` [PATCH v4 03/17] xfs: remove very old mount option Ian Kent
2019-10-03 10:25 ` [PATCH v4 04/17] xfs: mount-api - add fs parameter description Ian Kent
2019-10-03 10:25 ` [PATCH v4 05/17] xfs: mount-api - refactor suffix_kstrtoint() Ian Kent
2019-10-03 10:25 ` [PATCH v4 06/17] xfs: mount-api - refactor xfs_parseags() Ian Kent
2019-10-03 10:25 ` [PATCH v4 07/17] xfs: mount-api - make xfs_parse_param() take context .parse_param() args Ian Kent
2019-10-04 15:51 ` Brian Foster
2019-10-03 10:26 ` [PATCH v4 08/17] xfs: mount-api - move xfs_parseargs() validation to a helper Ian Kent
2019-10-04 15:51 ` Brian Foster
2019-10-03 10:26 ` Ian Kent [this message]
2019-10-03 10:26 ` [PATCH v4 10/17] xfs: mount-api - add xfs_get_tree() Ian Kent
2019-10-04 15:52 ` Brian Foster
2019-10-04 22:56 ` Ian Kent
2019-10-03 10:26 ` [PATCH v4 11/17] xfs: mount-api - add xfs_remount_rw() helper Ian Kent
2019-10-03 10:26 ` [PATCH v4 12/17] xfs: mount-api - add xfs_remount_ro() helper Ian Kent
2019-10-03 10:26 ` [PATCH v4 13/17] xfs: mount api - add xfs_reconfigure() Ian Kent
2019-10-04 15:53 ` Brian Foster
2019-10-04 23:16 ` Ian Kent
2019-10-07 11:51 ` Brian Foster
2019-10-08 0:32 ` Ian Kent
2019-10-03 10:26 ` [PATCH v4 14/17] xfs: mount-api - add xfs_fc_free() Ian Kent
2019-10-07 11:51 ` Brian Foster
2019-10-08 0:35 ` Ian Kent
2019-10-03 10:26 ` [PATCH v4 15/17] xfs: mount-api - dont set sb in xfs_mount_alloc() Ian Kent
2019-10-07 11:52 ` Brian Foster
2019-10-03 10:26 ` [PATCH v4 16/17] xfs: mount-api - switch to new mount-api Ian Kent
2019-10-07 11:52 ` Brian Foster
2019-10-03 10:26 ` [PATCH v4 17/17] xfs: mount-api - remove remaining legacy mount code Ian Kent
2019-10-07 11:52 ` Brian Foster
2019-10-03 23:30 ` [PATCH v4 00/17] xfs: mount API patch series Eric Sandeen
2019-10-04 6:57 ` Ian Kent
2019-10-04 8:25 ` Ian Kent
2019-10-04 8:54 ` Ian Kent
2019-10-04 13:19 ` Eric Sandeen
2019-10-07 11:52 ` Brian Foster
2019-10-08 0:13 ` Ian Kent
2019-10-08 0:35 ` Darrick J. Wong
2019-10-08 1:20 ` Ian Kent
2019-10-08 1:35 ` Darrick J. Wong
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=157009836693.13858.2543927672631996230.stgit@fedora-28 \
--to=raven@themaw.net \
--cc=bfoster@redhat.com \
--cc=dchinner@redhat.com \
--cc=dhowells@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
--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).