sys/linux: add test_dummy_encryption=v1 mount flag for ext4 and f2fs

1 files changed, 168 insertions, 166 deletions

diff --git a/sys/linux/filesystem.txt b/sys/linux/filesystem.txt
index d31332453..c4c788043 100644
--- a/sys/linux/filesystem.txt
+++ b/sys/linux/filesystem.txt
@@ -648,178 +648,180 @@ ntfs3_options [
 ] [varlen]
 
 ext4_options [
-	bsddf			stringnoz["bsddf"]
-	minixdf			stringnoz["minixdf"]
-	grpid			stringnoz["grpid"]
-	bsdgroups		stringnoz["bsdgroups"]
-	nogrpid			stringnoz["nogrpid"]
-	sysvgroups		stringnoz["sysvgroups"]
-	errors_continue		stringnoz["errors=continue"]
-	errors_remount		stringnoz["errors=remount-ro"]
-	nouid32			stringnoz["nouid32"]
-	debug			stringnoz["debug"]
-	oldalloc		stringnoz["oldalloc"]
-	orlov			stringnoz["orlov"]
-	user_xattr		stringnoz["user_xattr"]
-	nouser_xattr		stringnoz["nouser_xattr"]
-	acl			stringnoz["acl"]
-	noacl			stringnoz["noacl"]
-	norecovery		stringnoz["norecovery"]
-	noload			stringnoz["noload"]
-	nobh			stringnoz["nobh"]
-	bh			stringnoz["bh"]
-	journal_checksum	stringnoz["journal_checksum"]
-	nojournal_checksum	stringnoz["nojournal_checksum"]
-	journal_async_commit	stringnoz["journal_async_commit"]
-	abort			stringnoz["abort"]
-	data_journal		stringnoz["data=journal"]
-	data_ordered		stringnoz["data=ordered"]
-	data_writeback		stringnoz["data=writeback"]
-	data_err_abort		stringnoz["data_err=abort"]
-	data_err_ignore		stringnoz["data_err=ignore"]
-	usrjquota		stringnoz["usrjquota="]
-	grpjquota		stringnoz["grpjquota="]
-	jqfmt_vfsold		stringnoz["jqfmt=vfsold"]
-	jqfmt_vfsv0		stringnoz["jqfmt=vfsv0"]
-	jqfmt_vfsv1		stringnoz["jqfmt=vfsv1"]
-	grpquota		stringnoz["grpquota"]
-	noquota			stringnoz["noquota"]
-	quota			stringnoz["quota"]
-	usrquota		stringnoz["usrquota"]
-	prjquota		stringnoz["prjquota"]
-	barrier			stringnoz["barrier"]
-	nobarrier		stringnoz["nobarrier"]
-	i_version		stringnoz["i_version"]
-	dax			stringnoz["dax"]
-	dax_always		stringnoz["dax=always"]
-	dax_inode		stringnoz["dax=inode"]
-	dax_never		stringnoz["dax=never"]
-	delalloc		stringnoz["delalloc"]
-	lazytime		stringnoz["lazytime"]
-	nolazytime		stringnoz["nolazytime"]
-	nodelalloc		stringnoz["nodelalloc"]
-	mblk_io_submit		stringnoz["mblk_io_submit"]
-	nomblk_io_submit	stringnoz["nomblk_io_submit"]
-	block_validity		stringnoz["block_validity"]
-	noblock_validity	stringnoz["noblock_validity"]
-	auto_da_alloc		stringnoz["auto_da_alloc"]
-	noauto_da_alloc		stringnoz["noauto_da_alloc"]
-	dioread_nolock		stringnoz["dioread_nolock"]
-	nodioread_nolock	stringnoz["nodioread_nolock"]
-	dioread_lock		stringnoz["dioread_lock"]
-	discard			stringnoz["discard"]
-	nodiscard		stringnoz["nodiscard"]
-	init_itable		stringnoz["init_itable"]
-	noinit_itable		stringnoz["noinit_itable"]
-	test_dummy_encryption	stringnoz["test_dummy_encryption"]
-	nombcache		stringnoz["nombcache"]
-	inlinecrypt		stringnoz["inlinecrypt"]
-	mb_optimize_scan	fs_opt_hex["mb_optimize_scan", int32[0:1]]
-	resgid			fs_opt_hex["resgid", gid]
-	resuid			fs_opt_hex["resuid", uid]
-	sb			fs_opt_hex["sb", int32]
-	commit			fs_opt_hex["commit", int32]
-	min_batch_time		fs_opt_hex["min_batch_time", int32]
-	max_batch_time		fs_opt_hex["max_batch_time", int32]
-	journal_dev		fs_opt_hex["journal_dev", int32]
-	barrier_val		fs_opt_hex["barrier", int32]
-	stripe			fs_opt_hex["stripe", int32]
-	debug_want_extra_isize	fs_opt_hex["debug_want_extra_isize", int32]
-	inode_readahead_blks	fs_opt_hex["inode_readahead_blks", flags[ext4_inode_readahead_blks]]
-	journal_ioprio		fs_opt_hex["journal_ioprio", int32[0:7]]
-	auto_da_alloc_val	fs_opt_hex["auto_da_alloc", int32]
-	init_itable_val		fs_opt_hex["init_itable", int32]
-	max_dir_size_kb		fs_opt_hex["max_dir_size_kb", int32]
-	journal_path		fs_opt_filename["journal_path"]
-	grpjquota_path		fs_opt_filename["grpjquota"]
-	usrjquota_path		fs_opt_filename["usrjquota"]
+	bsddf				stringnoz["bsddf"]
+	minixdf				stringnoz["minixdf"]
+	grpid				stringnoz["grpid"]
+	bsdgroups			stringnoz["bsdgroups"]
+	nogrpid				stringnoz["nogrpid"]
+	sysvgroups			stringnoz["sysvgroups"]
+	errors_continue			stringnoz["errors=continue"]
+	errors_remount			stringnoz["errors=remount-ro"]
+	nouid32				stringnoz["nouid32"]
+	debug				stringnoz["debug"]
+	oldalloc			stringnoz["oldalloc"]
+	orlov				stringnoz["orlov"]
+	user_xattr			stringnoz["user_xattr"]
+	nouser_xattr			stringnoz["nouser_xattr"]
+	acl				stringnoz["acl"]
+	noacl				stringnoz["noacl"]
+	norecovery			stringnoz["norecovery"]
+	noload				stringnoz["noload"]
+	nobh				stringnoz["nobh"]
+	bh				stringnoz["bh"]
+	journal_checksum		stringnoz["journal_checksum"]
+	nojournal_checksum		stringnoz["nojournal_checksum"]
+	journal_async_commit		stringnoz["journal_async_commit"]
+	abort				stringnoz["abort"]
+	data_journal			stringnoz["data=journal"]
+	data_ordered			stringnoz["data=ordered"]
+	data_writeback			stringnoz["data=writeback"]
+	data_err_abort			stringnoz["data_err=abort"]
+	data_err_ignore			stringnoz["data_err=ignore"]
+	usrjquota			stringnoz["usrjquota="]
+	grpjquota			stringnoz["grpjquota="]
+	jqfmt_vfsold			stringnoz["jqfmt=vfsold"]
+	jqfmt_vfsv0			stringnoz["jqfmt=vfsv0"]
+	jqfmt_vfsv1			stringnoz["jqfmt=vfsv1"]
+	grpquota			stringnoz["grpquota"]
+	noquota				stringnoz["noquota"]
+	quota				stringnoz["quota"]
+	usrquota			stringnoz["usrquota"]
+	prjquota			stringnoz["prjquota"]
+	barrier				stringnoz["barrier"]
+	nobarrier			stringnoz["nobarrier"]
+	i_version			stringnoz["i_version"]
+	dax				stringnoz["dax"]
+	dax_always			stringnoz["dax=always"]
+	dax_inode			stringnoz["dax=inode"]
+	dax_never			stringnoz["dax=never"]
+	delalloc			stringnoz["delalloc"]
+	lazytime			stringnoz["lazytime"]
+	nolazytime			stringnoz["nolazytime"]
+	nodelalloc			stringnoz["nodelalloc"]
+	mblk_io_submit			stringnoz["mblk_io_submit"]
+	nomblk_io_submit		stringnoz["nomblk_io_submit"]
+	block_validity			stringnoz["block_validity"]
+	noblock_validity		stringnoz["noblock_validity"]
+	auto_da_alloc			stringnoz["auto_da_alloc"]
+	noauto_da_alloc			stringnoz["noauto_da_alloc"]
+	dioread_nolock			stringnoz["dioread_nolock"]
+	nodioread_nolock		stringnoz["nodioread_nolock"]
+	dioread_lock			stringnoz["dioread_lock"]
+	discard				stringnoz["discard"]
+	nodiscard			stringnoz["nodiscard"]
+	init_itable			stringnoz["init_itable"]
+	noinit_itable			stringnoz["noinit_itable"]
+	test_dummy_encryption		stringnoz["test_dummy_encryption"]
+	test_dummy_encryption_v1	stringnoz["test_dummy_encryption=v1"]
+	nombcache			stringnoz["nombcache"]
+	inlinecrypt			stringnoz["inlinecrypt"]
+	mb_optimize_scan		fs_opt_hex["mb_optimize_scan", int32[0:1]]
+	resgid				fs_opt_hex["resgid", gid]
+	resuid				fs_opt_hex["resuid", uid]
+	sb				fs_opt_hex["sb", int32]
+	commit				fs_opt_hex["commit", int32]
+	min_batch_time			fs_opt_hex["min_batch_time", int32]
+	max_batch_time			fs_opt_hex["max_batch_time", int32]
+	journal_dev			fs_opt_hex["journal_dev", int32]
+	barrier_val			fs_opt_hex["barrier", int32]
+	stripe				fs_opt_hex["stripe", int32]
+	debug_want_extra_isize		fs_opt_hex["debug_want_extra_isize", int32]
+	inode_readahead_blks		fs_opt_hex["inode_readahead_blks", flags[ext4_inode_readahead_blks]]
+	journal_ioprio			fs_opt_hex["journal_ioprio", int32[0:7]]
+	auto_da_alloc_val		fs_opt_hex["auto_da_alloc", int32]
+	init_itable_val			fs_opt_hex["init_itable", int32]
+	max_dir_size_kb			fs_opt_hex["max_dir_size_kb", int32]
+	journal_path			fs_opt_filename["journal_path"]
+	grpjquota_path			fs_opt_filename["grpjquota"]
+	usrjquota_path			fs_opt_filename["usrjquota"]
 ] [varlen]
 
 ext4_types = "ext4", "ext3", "ext2"
 ext4_inode_readahead_blks = 0, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 0x1000, 0x2000, 0x4000, 0x8000, 0x10000, 0x20000, 0x40000, 0x80000, 0x100000, 0x200000, 0x400000, 0x800000, 0x1000000, 0x2000000, 0x4000000, 0x8000000
 
 f2fs_options [
-	background_gc_sync	stringnoz["background_gc=sync"]
-	background_gc_off	stringnoz["background_gc=off"]
-	background_gc_on	stringnoz["background_gc=on"]
-	disable_roll_forward	stringnoz["disable_roll_forward"]
-	norecovery		stringnoz["norecovery"]
-	discard			stringnoz["discard"]
-	nodiscard		stringnoz["nodiscard"]
-	noheap			stringnoz["no_heap"]
-	heap			stringnoz["heap"]
-	user_xattr		stringnoz["user_xattr"]
-	nouser_xattr		stringnoz["nouser_xattr"]
-	acl			stringnoz["acl"]
-	noacl			stringnoz["noacl"]
-	six_active_logs		stringnoz["active_logs=6"]
-	four_active_logs	stringnoz["active_logs=4"]
-	two_active_logs		stringnoz["active_logs=2"]
-	disable_ext_identify	stringnoz["disable_ext_identify"]
-	inline_xattr		stringnoz["inline_xattr"]
-	noinline_xattr		stringnoz["noinline_xattr"]
-	inline_xattr_size	fs_opt_hex["inline_xattr_size", int32]
-	inline_data		stringnoz["inline_data"]
-	noinline_data		stringnoz["noinline_data"]
-	inline_dentry		stringnoz["inline_dentry"]
-	noinline_dentry		stringnoz["noinline_dentry"]
-	flush_merge		stringnoz["flush_merge"]
-	noflush_merge		stringnoz["noflush_merge"]
-	barrier			stringnoz["barrier"]
-	nobarrier		stringnoz["nobarrier"]
-	fastboot		stringnoz["fastboot"]
-	extent_cache		stringnoz["extent_cache"]
-	noextent_cache		stringnoz["noextent_cache"]
-	data_flush		stringnoz["data_flush"]
-	reserve_root		fs_opt_dec["reserver_root", int32]
-	adaptive_mode		stringnoz["mode=adaptive"]
-	lfs_mode		stringnoz["mode=lfs"]
-	segment_mode		stringnoz["mode=fragment:segment"]
-	block_mode		stringnoz["mode=fragment:block"]
-	io_bits			fs_opt_dec["io_bits", int32[0:256]]
-	fault_injection		fs_opt_dec["fault_injection", int32]
-	fault_type		fs_opt_dec["fault_type", int32]
-	resgid			fs_opt_hex["resgid", gid]
-	resuid			fs_opt_hex["resuid", uid]
-	lazytime		stringnoz["lazytime"]
-	nolazytime		stringnoz["nolazytime"]
-	quota			stringnoz["quota"]
-	noquota			stringnoz["noquota"]
-	usrquota		fs_opt_str["usrquota"]
-	grpquota		fs_opt_str["grpquota"]
-	prjquota		fs_opt_str["prjquota"]
-	usrjquota		fs_opt_str["usrjquota"]
-	grpjquota		fs_opt_str["grpjquota"]
-	prjjquota		fs_opt_str["prjjquota"]
-	jqfmt_vfsold		stringnoz["jqfmt=vfsold"]
-	jqfmt_vfsv0		stringnoz["jqfmt=vfsv0"]
-	jqfmt_vfsv1		stringnoz["jqfmt=vfsv1"]
-	whint_mode_user		stringnoz["whint_mode=user-based"]
-	whint_mode_off		stringnoz["whint_mode=off"]
-	whint_mode_fs		stringnoz["whint_mode=fs-based"]
-	alloc_mode_def		stringnoz["alloc_mode=default"]
-	alloc_mode_reuse	stringnoz["alloc_mode=reuse"]
-	fsync_mode_posix	stringnoz["fsync_mode=posix"]
-	fsync_mode_strict	stringnoz["fsync_mode=strict"]
-	test_dummy_encryption	stringnoz["test_dummy_encryption"]
-	errors_continue		stringnoz["errors=continue"]
-	errors_remount		stringnoz["errors=remount-ro"]
-	inlinecrypt		stringnoz["inlinecrypt"]
-	checkpoint_diasble	stringnoz["checkpoint=disable"]
-	checkpoint_enable	stringnoz["checkpoint=enable"]
-	checkpoint_merge	stringnoz["checkpoint=merge"]
-	nocheckpoint_merge	stringnoz["nocheckpoint_merge"]
-	compress_chksum		stringnoz["compress_chksum"]
-	compress_cache		stringnoz["compress_cache"]
-	atgc			stringnoz["atgc"]
-	gc_merge		stringnoz["gc_merge"]
-	nogc_merge		stringnoz["nogc_merge"]
-	discard_unit_block	stringnoz["discard_unit=block"]
-	discard_unit_segment	stringnoz["discard_unit=segment"]
-	discard_unit_section	stringnoz["discard_unit=section"]
-	memory_normal		stringnoz["memory=normal"]
-	memory_low		stringnoz["memory=low"]
-	age_extent_cache	stringnoz["age_extent_cache"]
+	background_gc_sync		stringnoz["background_gc=sync"]
+	background_gc_off		stringnoz["background_gc=off"]
+	background_gc_on		stringnoz["background_gc=on"]
+	disable_roll_forward		stringnoz["disable_roll_forward"]
+	norecovery			stringnoz["norecovery"]
+	discard				stringnoz["discard"]
+	nodiscard			stringnoz["nodiscard"]
+	noheap				stringnoz["no_heap"]
+	heap				stringnoz["heap"]
+	user_xattr			stringnoz["user_xattr"]
+	nouser_xattr			stringnoz["nouser_xattr"]
+	acl				stringnoz["acl"]
+	noacl				stringnoz["noacl"]
+	six_active_logs			stringnoz["active_logs=6"]
+	four_active_logs		stringnoz["active_logs=4"]
+	two_active_logs			stringnoz["active_logs=2"]
+	disable_ext_identify		stringnoz["disable_ext_identify"]
+	inline_xattr			stringnoz["inline_xattr"]
+	noinline_xattr			stringnoz["noinline_xattr"]
+	inline_xattr_size		fs_opt_hex["inline_xattr_size", int32]
+	inline_data			stringnoz["inline_data"]
+	noinline_data			stringnoz["noinline_data"]
+	inline_dentry			stringnoz["inline_dentry"]
+	noinline_dentry			stringnoz["noinline_dentry"]
+	flush_merge			stringnoz["flush_merge"]
+	noflush_merge			stringnoz["noflush_merge"]
+	barrier				stringnoz["barrier"]
+	nobarrier			stringnoz["nobarrier"]
+	fastboot			stringnoz["fastboot"]
+	extent_cache			stringnoz["extent_cache"]
+	noextent_cache			stringnoz["noextent_cache"]
+	data_flush			stringnoz["data_flush"]
+	reserve_root			fs_opt_dec["reserver_root", int32]
+	adaptive_mode			stringnoz["mode=adaptive"]
+	lfs_mode			stringnoz["mode=lfs"]
+	segment_mode			stringnoz["mode=fragment:segment"]
+	block_mode			stringnoz["mode=fragment:block"]
+	io_bits				fs_opt_dec["io_bits", int32[0:256]]
+	fault_injection			fs_opt_dec["fault_injection", int32]
+	fault_type			fs_opt_dec["fault_type", int32]
+	resgid				fs_opt_hex["resgid", gid]
+	resuid				fs_opt_hex["resuid", uid]
+	lazytime			stringnoz["lazytime"]
+	nolazytime			stringnoz["nolazytime"]
+	quota				stringnoz["quota"]
+	noquota				stringnoz["noquota"]
+	usrquota			fs_opt_str["usrquota"]
+	grpquota			fs_opt_str["grpquota"]
+	prjquota			fs_opt_str["prjquota"]
+	usrjquota			fs_opt_str["usrjquota"]
+	grpjquota			fs_opt_str["grpjquota"]
+	prjjquota			fs_opt_str["prjjquota"]
+	jqfmt_vfsold			stringnoz["jqfmt=vfsold"]
+	jqfmt_vfsv0			stringnoz["jqfmt=vfsv0"]
+	jqfmt_vfsv1			stringnoz["jqfmt=vfsv1"]
+	whint_mode_user			stringnoz["whint_mode=user-based"]
+	whint_mode_off			stringnoz["whint_mode=off"]
+	whint_mode_fs			stringnoz["whint_mode=fs-based"]
+	alloc_mode_def			stringnoz["alloc_mode=default"]
+	alloc_mode_reuse		stringnoz["alloc_mode=reuse"]
+	fsync_mode_posix		stringnoz["fsync_mode=posix"]
+	fsync_mode_strict		stringnoz["fsync_mode=strict"]
+	test_dummy_encryption		stringnoz["test_dummy_encryption"]
+	test_dummy_encryption_v1	stringnoz["test_dummy_encryption=v1"]
+	errors_continue			stringnoz["errors=continue"]
+	errors_remount			stringnoz["errors=remount-ro"]
+	inlinecrypt			stringnoz["inlinecrypt"]
+	checkpoint_diasble		stringnoz["checkpoint=disable"]
+	checkpoint_enable		stringnoz["checkpoint=enable"]
+	checkpoint_merge		stringnoz["checkpoint=merge"]
+	nocheckpoint_merge		stringnoz["nocheckpoint_merge"]
+	compress_chksum			stringnoz["compress_chksum"]
+	compress_cache			stringnoz["compress_cache"]
+	atgc				stringnoz["atgc"]
+	gc_merge			stringnoz["gc_merge"]
+	nogc_merge			stringnoz["nogc_merge"]
+	discard_unit_block		stringnoz["discard_unit=block"]
+	discard_unit_segment		stringnoz["discard_unit=segment"]
+	discard_unit_section		stringnoz["discard_unit=section"]
+	memory_normal			stringnoz["memory=normal"]
+	memory_low			stringnoz["memory=low"]
+	age_extent_cache		stringnoz["age_extent_cache"]
 ] [varlen]
 
 ocfs2_options [