sdcardfs: Bring up to date with Android M permissions:
In M, the workings of sdcardfs were changed significantly.
This brings sdcardfs into line with the changes.
Change-Id: I10e91a84a884c838feef7aa26c0a2b21f02e052e
diff --git a/fs/sdcardfs/super.c b/fs/sdcardfs/super.c
index f153ce1..1d64901 100644
--- a/fs/sdcardfs/super.c
+++ b/fs/sdcardfs/super.c
@@ -46,9 +46,6 @@
sdcardfs_set_lower_super(sb, NULL);
atomic_dec(&s->s_active);
- if(spd->pkgl_id)
- packagelist_destroy(spd->pkgl_id);
-
kfree(spd);
sb->s_fs_info = NULL;
}
@@ -203,12 +200,8 @@
if (opts->fs_low_gid != 0)
seq_printf(m, ",gid=%u", opts->fs_low_gid);
- if (opts->derive == DERIVE_NONE)
- seq_printf(m, ",derive=none");
- else if (opts->derive == DERIVE_LEGACY)
- seq_printf(m, ",derive=legacy");
- else if (opts->derive == DERIVE_UNIFIED)
- seq_printf(m, ",derive=unified");
+ if (opts->multiuser)
+ seq_printf(m, ",multiuser");
if (opts->reserved_mb != 0)
seq_printf(m, ",reserved=%uMB", opts->reserved_mb);