Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Lukas Czerner <lczerner@redhat.com>
To:     linux-ext4@vger.kernel.org
Cc:     dhowells@redhat.com, viro@zeniv.linux.org.uk
Subject: [PATCH v2 11/17] ext4: add ext4_get_tree for the new mount API
Date:   Tue, 28 Apr 2020 18:45:30 +0200
Message-Id: <20200428164536.462-12-lczerner@redhat.com>
In-Reply-To: <20200428164536.462-1-lczerner@redhat.com>
References: <20200428164536.462-1-lczerner@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 fs/ext4/super.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 81238dddc3b7..729a07c298e2 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -93,6 +93,7 @@ static int ext4_check_opt_consistency(struct fs_context=
 *fc,
 				      struct super_block *sb);
 static void ext4_apply_options(struct fs_context *fc, struct super_block=
 *sb);
 static int ext4_parse_param(struct fs_context *fc, struct fs_parameter *=
param);
+static int ext4_get_tree(struct fs_context *fc);
=20
 /*
  * Lock ordering
@@ -124,6 +125,7 @@ static int ext4_parse_param(struct fs_context *fc, st=
ruct fs_parameter *param);
=20
 static const struct fs_context_operations ext4_context_ops =3D {
 	.parse_param	=3D ext4_parse_param,
+	.get_tree	=3D ext4_get_tree,
 };
=20
 #if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defin=
ed(CONFIG_EXT4_USE_FOR_EXT2)
@@ -5340,6 +5342,42 @@ static int ext4_fill_super(struct super_block *sb,=
 void *data, int silent)
 	return ret;
 }
=20
+static int ext4_fill_super_fc(struct super_block *sb, struct fs_context =
*fc)
+{
+	struct ext4_fs_context *ctx =3D fc->fs_private;
+	struct ext4_sb_info *sbi;
+	int ret;
+
+	sbi =3D ext4_alloc_sbi(sb);
+	if (!sbi)
+		return -ENOMEM;
+
+	fc->s_fs_info =3D sbi;
+
+	/* Cleanup superblock name */
+	strreplace(sb->s_id, '/', '!');
+
+	sbi->s_sb_block =3D 1;	/* Default super block location */
+	if (ctx->spec & EXT4_SPEC_s_sb_block)
+		sbi->s_sb_block =3D ctx->s_sb_block;
+
+	ret =3D __ext4_fill_super(fc, sb, fc->sb_flags & SB_SILENT);
+	if (ret < 0)
+		goto free_sbi;
+
+	return 0;
+
+free_sbi:
+	ext4_free_sbi(sbi);
+	fc->s_fs_info =3D NULL;
+	return ret;
+}
+
+static int ext4_get_tree(struct fs_context *fc)
+{
+	return get_tree_bdev(fc, ext4_fill_super_fc);
+}
+
 /*
  * Setup any per-fs journal parameters now.  We'll do this both on
  * initial mount, once the journal has been initialised but before we've
--=20
2.21.1