In i915 we now have our own tmpfs mount, so ensure that shmem_fill_super also calls shmem_parse_options when dealing with a kernel mount. Otherwise we have to clumsily call remount_fs when we want to supply our mount options.
Signed-off-by: Matthew Auld <[email protected]> Cc: Joonas Lahtinen <[email protected]> Cc: Chris Wilson <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: [email protected] --- mm/shmem.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index ae2e46291ffa..6074e527b9b9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3781,13 +3781,15 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) if (!(sb->s_flags & MS_KERNMOUNT)) { sbinfo->max_blocks = shmem_default_max_blocks(); sbinfo->max_inodes = shmem_default_max_inodes(); - if (shmem_parse_options(data, sbinfo, false)) { - err = -EINVAL; - goto failed; - } } else { sb->s_flags |= MS_NOUSER; } + + if (shmem_parse_options(data, sbinfo, false)) { + err = -EINVAL; + goto failed; + } + sb->s_export_op = &shmem_export_ops; sb->s_flags |= MS_NOSEC; #else -- 2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
