summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2019-09-26 10:21:18 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2019-09-26 10:26:55 -0400
commita3bc18a48e2e678efe62f1f9989902f9cd19e0ff (patch)
treebdcd852bab324000d1f31e3082c51c94760f8207
parent1f52aa08d12f8d359e71b4bfd73ca9d5d668e4da (diff)
jffs2: Fix mounting under new mount API
The mounting of jffs2 is broken due to the changes from the new mount API because it specifies a "source" operation, but then doesn't actually process it. But because it specified it, it doesn't return -ENOPARAM and the caller doesn't process it either and the source gets lost. Fix this by simply removing the source parameter from jffs2 and letting the VFS deal with it in the default manner. To test it, enable CONFIG_MTD_MTDRAM and allow the default size and erase block size parameters, then try and mount the /dev/mtdblock<N> file that that creates as jffs2. No need to initialise it. Fixes: ec10a24f10c8 ("vfs: Convert jffs2 to use the new mount API") Reported-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> cc: David Woodhouse <dwmw2@infradead.org> cc: Richard Weinberger <richard@nod.at> cc: linux-mtd@lists.infradead.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/jffs2/super.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index cbe70637c117..0e6406c4f362 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -163,13 +163,11 @@ static const struct export_operations jffs2_export_ops = {
163 * Opt_rp_size: size of reserved pool in KiB 163 * Opt_rp_size: size of reserved pool in KiB
164 */ 164 */
165enum { 165enum {
166 Opt_source,
167 Opt_override_compr, 166 Opt_override_compr,
168 Opt_rp_size, 167 Opt_rp_size,
169}; 168};
170 169
171static const struct fs_parameter_spec jffs2_param_specs[] = { 170static const struct fs_parameter_spec jffs2_param_specs[] = {
172 fsparam_string ("source", Opt_source),
173 fsparam_enum ("compr", Opt_override_compr), 171 fsparam_enum ("compr", Opt_override_compr),
174 fsparam_u32 ("rp_size", Opt_rp_size), 172 fsparam_u32 ("rp_size", Opt_rp_size),
175 {} 173 {}