Commit dadedd85 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 16cdf084 a3bc18a4
...@@ -163,13 +163,11 @@ static const struct export_operations jffs2_export_ops = { ...@@ -163,13 +163,11 @@ static const struct export_operations jffs2_export_ops = {
* Opt_rp_size: size of reserved pool in KiB * Opt_rp_size: size of reserved pool in KiB
*/ */
enum { enum {
Opt_source,
Opt_override_compr, Opt_override_compr,
Opt_rp_size, Opt_rp_size,
}; };
static const struct fs_parameter_spec jffs2_param_specs[] = { static const struct fs_parameter_spec jffs2_param_specs[] = {
fsparam_string ("source", Opt_source),
fsparam_enum ("compr", Opt_override_compr), fsparam_enum ("compr", Opt_override_compr),
fsparam_u32 ("rp_size", Opt_rp_size), fsparam_u32 ("rp_size", Opt_rp_size),
{} {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment