summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-09-26 11:33:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-26 11:33:30 -0700
commitdadedd85630af28b21c826265f7a651f040f6f13 (patch)
tree38e4c31a4088139538edbf8c917ed01531d9e645
parent16cdf08467848dc53acd2175d563b30a3cd486aa (diff)
parenta3bc18a48e2e678efe62f1f9989902f9cd19e0ff (diff)
Merge branch 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull jffs2 fix from Al Viro: "braino fix for mount API conversion for jffs2" * 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: jffs2: Fix mounting under new mount API
-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 = {
* Opt_rp_size: size of reserved pool in KiB
*/
enum {
- Opt_source,
Opt_override_compr,
Opt_rp_size,
};
static const struct fs_parameter_spec jffs2_param_specs[] = {
- fsparam_string ("source", Opt_source),
fsparam_enum ("compr", Opt_override_compr),
fsparam_u32 ("rp_size", Opt_rp_size),
{}