Commit 6e8948a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fs.idmapped.squashfs.v6.2' of... 

Merge tag 'fs.idmapped.squashfs.v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping

Pull squashfs update from Seth Forshee:
 "This is a simple patch to enable idmapped mounts for squashfs.

  All functionality squashfs needs to support idmapped mounts is already
  implemented in generic VFS code, so all that is needed is to set
  FS_ALLOW_IDMAP in fs_flags"

* tag 'fs.idmapped.squashfs.v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping:
  squashfs: enable idmapped mounts
parents 043930b1 42da66ac

fs/squashfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static struct file_system_type squashfs_fs_type = { 
	.init_fs_context = squashfs_init_fs_context,

	.parameters = squashfs_fs_parameters,

	.kill_sb = kill_block_super,

	.fs_flags = FS_REQUIRES_DEV

	.fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP,

};

MODULE_ALIAS_FS("squashfs");