sys/linux: refine vfat/msdos options

8 files changed, 334 insertions, 172 deletions

diff --git a/executor/syscalls_linux.h b/executor/syscalls_linux.h
index 2216e5aef..cb86c9fe6 100644
--- a/executor/syscalls_linux.h
+++ b/executor/syscalls_linux.h
@@ -2,7 +2,7 @@
 
 #if defined(__i386__) || 0
 #define GOARCH "386"
-#define SYZ_REVISION "cf997d1199a66365a41408900fd122b504315695"
+#define SYZ_REVISION "89120897f965d81dda2424ee8f4de61d675b3a0a"
 #define SYZ_EXECUTOR_USES_FORK_SERVER true
 #define SYZ_EXECUTOR_USES_SHMEM true
 #define SYZ_PAGE_SIZE 4096
@@ -2044,7 +2044,7 @@ const call_t syscalls[] = {
 
 #if defined(__x86_64__) || 0
 #define GOARCH "amd64"
-#define SYZ_REVISION "bca8355bd5a322980aee7b69352d85d0aabd600c"
+#define SYZ_REVISION "cc46ade4cca54c85961decd614d4d62ccceab02a"
 #define SYZ_EXECUTOR_USES_FORK_SERVER true
 #define SYZ_EXECUTOR_USES_SHMEM true
 #define SYZ_PAGE_SIZE 4096
@@ -4138,7 +4138,7 @@ const call_t syscalls[] = {
 
 #if defined(__arm__) || 0
 #define GOARCH "arm"
-#define SYZ_REVISION "719f666fb08fc8ce1a0b5a23d15b6f808b7712c9"
+#define SYZ_REVISION "cd646409311be12e935251543ee6c9fb00c07bf7"
 #define SYZ_EXECUTOR_USES_FORK_SERVER true
 #define SYZ_EXECUTOR_USES_SHMEM true
 #define SYZ_PAGE_SIZE 4096
@@ -6188,7 +6188,7 @@ const call_t syscalls[] = {
 
 #if defined(__aarch64__) || 0
 #define GOARCH "arm64"
-#define SYZ_REVISION "728bedc655889739b342618d43782a7e012eaedb"
+#define SYZ_REVISION "0a388ae8da39f06f93f9dc2dceb437be93c57511"
 #define SYZ_EXECUTOR_USES_FORK_SERVER true
 #define SYZ_EXECUTOR_USES_SHMEM true
 #define SYZ_PAGE_SIZE 4096
@@ -8210,7 +8210,7 @@ const call_t syscalls[] = {
 
 #if defined(__ppc64__) || defined(__PPC64__) || defined(__powerpc64__) || 0
 #define GOARCH "ppc64le"
-#define SYZ_REVISION "4b0dd8680e2388674a5e6c81256fa2c9b031a202"
+#define SYZ_REVISION "df3267ccf2ff05e4e78d2c2aa7e18fd924603fd5"
 #define SYZ_EXECUTOR_USES_FORK_SERVER true
 #define SYZ_EXECUTOR_USES_SHMEM true
 #define SYZ_PAGE_SIZE 4096
diff --git a/sys/linux/9p.txt b/sys/linux/9p.txt
index de7f2d04c..5f2c87a80 100644
--- a/sys/linux/9p.txt
+++ b/sys/linux/9p.txt
@@ -36,7 +36,7 @@ fs9p_options [
 	cache_loose	stringnoz["cache=loose"]
 	cache_fscache	stringnoz["cache=fscache"]
 	cache_mmap	stringnoz["cache=mmap"]
-	debug		fs_opt_dec["fs_opt_dec"]
+	debug		fs_opt_dec["debug"]
 	noextend	stringnoz["noextend"]
 	nodevmap	stringnoz["nodevmap"]
 	version_9p2000	stringnoz["version=9p2000"]
diff --git a/sys/linux/filesystem.txt b/sys/linux/filesystem.txt
index 14a5077a2..ad5bc60f3 100644
--- a/sys/linux/filesystem.txt
+++ b/sys/linux/filesystem.txt
@@ -14,7 +14,7 @@ syz_read_part_table(size intptr, nsegs len[segments], segments ptr[in, array[fs_
 
 syz_mount_image$vfat(fs ptr[in, string["vfat"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts ptr[in, fs_options[vfat_options]])
 
-syz_mount_image$msdos(fs ptr[in, string["msdos"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts ptr[in, fs_options[vfat_options]])
+syz_mount_image$msdos(fs ptr[in, string["msdos"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts ptr[in, fs_options[msdos_options]])
 
 syz_mount_image$bfs(fs ptr[in, string["bfs"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts const[0])
 
@@ -87,7 +87,29 @@ type fs_opt_cp_num[NAME] fs_opt[NAME, stringnoz[codepage_nums]]
 fs_opt_digits = '-', 'x', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
 fs_opt_digits_suffix = '-', 'x', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'k', 'm', 'g', 't', 'p', 'e'
 
+msdos_options [
+	fat	fat_options
+	nodots	stringnoz["nodots"]
+	dots	stringnoz["dots"]
+] [varlen]
+
 vfat_options [
+	fat		fat_options
+	iocharset	fs_opt_codepage["iocharset"]
+	rodir		stringnoz["rodir"]
+	utf8no		stringnoz["utf8=0"]
+	utf8		stringnoz["utf8=1"]
+	uni_xlateno	stringnoz["uni_xlate=0"]
+	uni_xlate	stringnoz["uni_xlate=1"]
+	numtail		stringnoz["nonumtail=0"]
+	nonumtail	stringnoz["nnonumtail=1"]
+	shortname_lower	stringnoz["shortname=lower"]
+	shortname_win95	stringnoz["shortname=win95"]
+	shortname_winnt	stringnoz["shortname=winnt"]
+	shortname_mixed	stringnoz["shortname=mixed"]
+] [varlen]
+
+fat_options [
 	check_relaxed	stringnoz["check=relaxed"]
 	check_strict	stringnoz["check=strict"]
 	check_normal	stringnoz["check=normal"]
diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
index 35a3bd518..ad3da21b0 100644
--- a/sys/linux/gen/386.go
+++ b/sys/linux/gen/386.go
@@ -3214,6 +3214,33 @@ var structDescs_386 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_MARK, int16], tc_u32_mark]"}, FldName: "TCA_U32_MARK"},
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_FLAGS, int16], int32[0:8]]"}, FldName: "TCA_U32_FLAGS"},
 	}}},
+	{Key: StructKey{Name: "fat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fat_options", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
+		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+	}}},
 	{Key: StructKey{Name: "fd_set", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fd_set", TypeSize: 64, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask0", TypeSize: 8, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask1", TypeSize: 8, ArgDir: 2}}},
@@ -3455,7 +3482,7 @@ var structDescs_386 = []*KeyedStruct{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_loose", TypeSize: 11}, Kind: 2, Values: []string{"cache=loose"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_fscache", TypeSize: 13}, Kind: 2, Values: []string{"cache=fscache"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_mmap", TypeSize: 10}, Kind: 2, Values: []string{"cache=mmap"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "noextend", TypeSize: 8}, Kind: 2, Values: []string{"noextend"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodevmap", TypeSize: 8}, Kind: 2, Values: []string{"nodevmap"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "version_9p2000", TypeSize: 14}, Kind: 2, Values: []string{"version=9p2000"}, NoZ: true},
@@ -3651,6 +3678,11 @@ var structDescs_386 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
+	}}},
 	{Key: StructKey{Name: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 22}, Kind: 2, Values: []string{"debug_want_extra_isize"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -3711,11 +3743,6 @@ var structDescs_386 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", TypeSize: 1}}, Kind: 2, RangeBegin: 48, RangeEnd: 55}},
 	}}},
-	{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 10}, Kind: 2, Values: []string{"fs_opt_dec"}, NoZ: true},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
-	}}},
 	{Key: StructKey{Name: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 3}, Kind: 2, Values: []string{"gid"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -4096,6 +4123,10 @@ var structDescs_386 = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "jfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
 	}}},
+	{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "msdos_options"}, FldName: "elem"},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
+	}}},
 	{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&UnionType{Key: StructKey{Name: "ntfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
@@ -4152,6 +4183,10 @@ var structDescs_386 = []*KeyedStruct{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[jfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
 	}}},
+	{Key: StructKey{Name: "fs_options[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
+	}}},
 	{Key: StructKey{Name: "fs_options[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
@@ -7966,6 +8001,11 @@ var structDescs_386 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res2", TypeSize: 4, ArgDir: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res3", TypeSize: 4, ArgDir: 1}}},
 	}}},
+	{Key: StructKey{Name: "msdos_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msdos_options", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodots", TypeSize: 6}, Kind: 2, Values: []string{"nodots"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dots", TypeSize: 4}, Kind: 2, Values: []string{"dots"}, NoZ: true},
+	}}},
 	{Key: StructKey{Name: "msghdr_alg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msghdr_alg", TypeSize: 28}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "addr", TypeSize: 4}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "addrlen", TypeSize: 4}}},
@@ -17749,31 +17789,19 @@ var structDescs_386 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true},
 	}}},
 	{Key: StructKey{Name: "vfat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vfat_options", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"iocharset\", stringnoz[codepages_names]]"}, FldName: "iocharset"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "rodir", TypeSize: 5}, Kind: 2, Values: []string{"rodir"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8no", TypeSize: 6}, Kind: 2, Values: []string{"utf8=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8", TypeSize: 6}, Kind: 2, Values: []string{"utf8=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlateno", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlate", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "numtail", TypeSize: 11}, Kind: 2, Values: []string{"nonumtail=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nonumtail", TypeSize: 12}, Kind: 2, Values: []string{"nnonumtail=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_lower", TypeSize: 15}, Kind: 2, Values: []string{"shortname=lower"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_win95", TypeSize: 15}, Kind: 2, Values: []string{"shortname=win95"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_winnt", TypeSize: 15}, Kind: 2, Values: []string{"shortname=winnt"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_mixed", TypeSize: 15}, Kind: 2, Values: []string{"shortname=mixed"}, NoZ: true},
 	}}},
 	{Key: StructKey{Name: "vhost_iotlb_msg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vhost_iotlb_msg", TypeSize: 32}, Fields: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "iova", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}},
@@ -30651,7 +30679,7 @@ var syscalls_386 = []*Syscall{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nsegs", TypeSize: 4}}, Buf: "segments"},
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "segments", TypeSize: 4}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_image_segment"}}}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mount_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{4096, 128, 64, 8192, 1024, 4, 2048, 8, 2, 1, 2097152, 32, 32768, 16777216, 16, 16384, 65536, 131072, 262144, 524288, 1048576, 8388608, 33554432}, BitMask: true},
-		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "fs_options[vfat_options]"}}},
+		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "fs_options[msdos_options]"}}},
 	}},
 	{Name: "syz_mount_image$nfs", CallName: "syz_mount_image", Args: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "fs", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 4}, Kind: 2, Values: []string{"nfs\x00"}}},
@@ -37354,4 +37382,4 @@ var consts_386 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_386 = "cf997d1199a66365a41408900fd122b504315695"
+const revision_386 = "89120897f965d81dda2424ee8f4de61d675b3a0a"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
index e982ef0f8..3b1a32449 100644
--- a/sys/linux/gen/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -3298,6 +3298,33 @@ var structDescs_amd64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_MARK, int16], tc_u32_mark]"}, FldName: "TCA_U32_MARK"},
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_FLAGS, int16], int32[0:8]]"}, FldName: "TCA_U32_FLAGS"},
 	}}},
+	{Key: StructKey{Name: "fat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fat_options", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
+		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+	}}},
 	{Key: StructKey{Name: "fd_set", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fd_set", TypeSize: 64, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask0", TypeSize: 8, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask1", TypeSize: 8, ArgDir: 2}}},
@@ -3541,7 +3568,7 @@ var structDescs_amd64 = []*KeyedStruct{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_loose", TypeSize: 11}, Kind: 2, Values: []string{"cache=loose"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_fscache", TypeSize: 13}, Kind: 2, Values: []string{"cache=fscache"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_mmap", TypeSize: 10}, Kind: 2, Values: []string{"cache=mmap"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "noextend", TypeSize: 8}, Kind: 2, Values: []string{"noextend"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodevmap", TypeSize: 8}, Kind: 2, Values: []string{"nodevmap"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "version_9p2000", TypeSize: 14}, Kind: 2, Values: []string{"version=9p2000"}, NoZ: true},
@@ -3737,6 +3764,11 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
+	}}},
 	{Key: StructKey{Name: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 22}, Kind: 2, Values: []string{"debug_want_extra_isize"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -3797,11 +3829,6 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", TypeSize: 1}}, Kind: 2, RangeBegin: 48, RangeEnd: 55}},
 	}}},
-	{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 10}, Kind: 2, Values: []string{"fs_opt_dec"}, NoZ: true},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
-	}}},
 	{Key: StructKey{Name: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 3}, Kind: 2, Values: []string{"gid"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -4182,6 +4209,10 @@ var structDescs_amd64 = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "jfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
 	}}},
+	{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "msdos_options"}, FldName: "elem"},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
+	}}},
 	{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&UnionType{Key: StructKey{Name: "ntfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
@@ -4238,6 +4269,10 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[jfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
 	}}},
+	{Key: StructKey{Name: "fs_options[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
+	}}},
 	{Key: StructKey{Name: "fs_options[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
@@ -8083,6 +8118,11 @@ var structDescs_amd64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res2", TypeSize: 8, ArgDir: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res3", TypeSize: 8, ArgDir: 1}}},
 	}}},
+	{Key: StructKey{Name: "msdos_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msdos_options", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodots", TypeSize: 6}, Kind: 2, Values: []string{"nodots"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dots", TypeSize: 4}, Kind: 2, Values: []string{"dots"}, NoZ: true},
+	}}},
 	{Key: StructKey{Name: "msgbuf"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msgbuf", IsVarlen: true}, Fields: []Type{
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "msgbuf_type", FldName: "typ", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}},
@@ -18074,31 +18114,19 @@ var structDescs_amd64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 7}}, IsPad: true},
 	}}},
 	{Key: StructKey{Name: "vfat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vfat_options", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"iocharset\", stringnoz[codepages_names]]"}, FldName: "iocharset"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "rodir", TypeSize: 5}, Kind: 2, Values: []string{"rodir"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8no", TypeSize: 6}, Kind: 2, Values: []string{"utf8=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8", TypeSize: 6}, Kind: 2, Values: []string{"utf8=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlateno", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlate", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "numtail", TypeSize: 11}, Kind: 2, Values: []string{"nonumtail=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nonumtail", TypeSize: 12}, Kind: 2, Values: []string{"nnonumtail=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_lower", TypeSize: 15}, Kind: 2, Values: []string{"shortname=lower"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_win95", TypeSize: 15}, Kind: 2, Values: []string{"shortname=win95"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_winnt", TypeSize: 15}, Kind: 2, Values: []string{"shortname=winnt"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_mixed", TypeSize: 15}, Kind: 2, Values: []string{"shortname=mixed"}, NoZ: true},
 	}}},
 	{Key: StructKey{Name: "vhost_iotlb_msg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vhost_iotlb_msg", TypeSize: 32}, Fields: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "iova", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}},
@@ -31313,7 +31341,7 @@ var syscalls_amd64 = []*Syscall{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nsegs", TypeSize: 8}}, Buf: "segments"},
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "segments", TypeSize: 8}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_image_segment"}}}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mount_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{4096, 128, 64, 8192, 1024, 4, 2048, 8, 2, 1, 2097152, 32, 32768, 16777216, 16, 16384, 65536, 131072, 262144, 524288, 1048576, 8388608, 33554432}, BitMask: true},
-		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fs_options[vfat_options]"}}},
+		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fs_options[msdos_options]"}}},
 	}},
 	{Name: "syz_mount_image$nfs", CallName: "syz_mount_image", Args: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "fs", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 4}, Kind: 2, Values: []string{"nfs\x00"}}},
@@ -38041,4 +38069,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_amd64 = "bca8355bd5a322980aee7b69352d85d0aabd600c"
+const revision_amd64 = "cc46ade4cca54c85961decd614d4d62ccceab02a"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
index 5b94b2384..fe6dcdcfc 100644
--- a/sys/linux/gen/arm.go
+++ b/sys/linux/gen/arm.go
@@ -3219,6 +3219,33 @@ var structDescs_arm = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_MARK, int16], tc_u32_mark]"}, FldName: "TCA_U32_MARK"},
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_FLAGS, int16], int32[0:8]]"}, FldName: "TCA_U32_FLAGS"},
 	}}},
+	{Key: StructKey{Name: "fat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fat_options", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
+		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+	}}},
 	{Key: StructKey{Name: "fd_set", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fd_set", TypeSize: 64, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask0", TypeSize: 8, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask1", TypeSize: 8, ArgDir: 2}}},
@@ -3460,7 +3487,7 @@ var structDescs_arm = []*KeyedStruct{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_loose", TypeSize: 11}, Kind: 2, Values: []string{"cache=loose"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_fscache", TypeSize: 13}, Kind: 2, Values: []string{"cache=fscache"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_mmap", TypeSize: 10}, Kind: 2, Values: []string{"cache=mmap"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "noextend", TypeSize: 8}, Kind: 2, Values: []string{"noextend"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodevmap", TypeSize: 8}, Kind: 2, Values: []string{"nodevmap"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "version_9p2000", TypeSize: 14}, Kind: 2, Values: []string{"version=9p2000"}, NoZ: true},
@@ -3656,6 +3683,11 @@ var structDescs_arm = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
+	}}},
 	{Key: StructKey{Name: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 22}, Kind: 2, Values: []string{"debug_want_extra_isize"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -3716,11 +3748,6 @@ var structDescs_arm = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", TypeSize: 1}}, Kind: 2, RangeBegin: 48, RangeEnd: 55}},
 	}}},
-	{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 10}, Kind: 2, Values: []string{"fs_opt_dec"}, NoZ: true},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
-	}}},
 	{Key: StructKey{Name: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 3}, Kind: 2, Values: []string{"gid"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -4101,6 +4128,10 @@ var structDescs_arm = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "jfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
 	}}},
+	{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "msdos_options"}, FldName: "elem"},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
+	}}},
 	{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&UnionType{Key: StructKey{Name: "ntfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
@@ -4157,6 +4188,10 @@ var structDescs_arm = []*KeyedStruct{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[jfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
 	}}},
+	{Key: StructKey{Name: "fs_options[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
+	}}},
 	{Key: StructKey{Name: "fs_options[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
@@ -7788,6 +7823,11 @@ var structDescs_arm = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res2", TypeSize: 4, ArgDir: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res3", TypeSize: 4, ArgDir: 1}}},
 	}}},
+	{Key: StructKey{Name: "msdos_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msdos_options", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodots", TypeSize: 6}, Kind: 2, Values: []string{"nodots"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dots", TypeSize: 4}, Kind: 2, Values: []string{"dots"}, NoZ: true},
+	}}},
 	{Key: StructKey{Name: "msgbuf"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msgbuf", IsVarlen: true}, Fields: []Type{
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "msgbuf_type", FldName: "typ", TypeSize: 4}}, Vals: []uint64{0, 1, 2, 3}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}},
@@ -17602,31 +17642,19 @@ var structDescs_arm = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 3}}, IsPad: true},
 	}}},
 	{Key: StructKey{Name: "vfat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vfat_options", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"iocharset\", stringnoz[codepages_names]]"}, FldName: "iocharset"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "rodir", TypeSize: 5}, Kind: 2, Values: []string{"rodir"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8no", TypeSize: 6}, Kind: 2, Values: []string{"utf8=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8", TypeSize: 6}, Kind: 2, Values: []string{"utf8=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlateno", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlate", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "numtail", TypeSize: 11}, Kind: 2, Values: []string{"nonumtail=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nonumtail", TypeSize: 12}, Kind: 2, Values: []string{"nnonumtail=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_lower", TypeSize: 15}, Kind: 2, Values: []string{"shortname=lower"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_win95", TypeSize: 15}, Kind: 2, Values: []string{"shortname=win95"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_winnt", TypeSize: 15}, Kind: 2, Values: []string{"shortname=winnt"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_mixed", TypeSize: 15}, Kind: 2, Values: []string{"shortname=mixed"}, NoZ: true},
 	}}},
 	{Key: StructKey{Name: "vhost_iotlb_msg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vhost_iotlb_msg", TypeSize: 32}, Fields: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "iova", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}},
@@ -30566,7 +30594,7 @@ var syscalls_arm = []*Syscall{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nsegs", TypeSize: 4}}, Buf: "segments"},
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "segments", TypeSize: 4}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_image_segment"}}}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mount_flags", FldName: "flags", TypeSize: 4}}, Vals: []uint64{4096, 128, 64, 8192, 1024, 4, 2048, 8, 2, 1, 2097152, 32, 32768, 16777216, 16, 16384, 65536, 131072, 262144, 524288, 1048576, 8388608, 33554432}, BitMask: true},
-		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "fs_options[vfat_options]"}}},
+		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 4}, Type: &StructType{Key: StructKey{Name: "fs_options[msdos_options]"}}},
 	}},
 	{Name: "syz_mount_image$nfs", CallName: "syz_mount_image", Args: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "fs", TypeSize: 4}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 4}, Kind: 2, Values: []string{"nfs\x00"}}},
@@ -37212,4 +37240,4 @@ var consts_arm = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm = "719f666fb08fc8ce1a0b5a23d15b6f808b7712c9"
+const revision_arm = "cd646409311be12e935251543ee6c9fb00c07bf7"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
index c37d592e7..95127ab53 100644
--- a/sys/linux/gen/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -3298,6 +3298,33 @@ var structDescs_arm64 = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_MARK, int16], tc_u32_mark]"}, FldName: "TCA_U32_MARK"},
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_FLAGS, int16], int32[0:8]]"}, FldName: "TCA_U32_FLAGS"},
 	}}},
+	{Key: StructKey{Name: "fat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fat_options", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
+		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+	}}},
 	{Key: StructKey{Name: "fd_set", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fd_set", TypeSize: 64, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask0", TypeSize: 8, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask1", TypeSize: 8, ArgDir: 2}}},
@@ -3541,7 +3568,7 @@ var structDescs_arm64 = []*KeyedStruct{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_loose", TypeSize: 11}, Kind: 2, Values: []string{"cache=loose"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_fscache", TypeSize: 13}, Kind: 2, Values: []string{"cache=fscache"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_mmap", TypeSize: 10}, Kind: 2, Values: []string{"cache=mmap"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "noextend", TypeSize: 8}, Kind: 2, Values: []string{"noextend"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodevmap", TypeSize: 8}, Kind: 2, Values: []string{"nodevmap"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "version_9p2000", TypeSize: 14}, Kind: 2, Values: []string{"version=9p2000"}, NoZ: true},
@@ -3737,6 +3764,11 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
+	}}},
 	{Key: StructKey{Name: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 22}, Kind: 2, Values: []string{"debug_want_extra_isize"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -3797,11 +3829,6 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", TypeSize: 1}}, Kind: 2, RangeBegin: 48, RangeEnd: 55}},
 	}}},
-	{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 10}, Kind: 2, Values: []string{"fs_opt_dec"}, NoZ: true},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
-	}}},
 	{Key: StructKey{Name: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 3}, Kind: 2, Values: []string{"gid"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -4182,6 +4209,10 @@ var structDescs_arm64 = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "jfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
 	}}},
+	{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "msdos_options"}, FldName: "elem"},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
+	}}},
 	{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&UnionType{Key: StructKey{Name: "ntfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
@@ -4238,6 +4269,10 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[jfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
 	}}},
+	{Key: StructKey{Name: "fs_options[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
+	}}},
 	{Key: StructKey{Name: "fs_options[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
@@ -7888,6 +7923,11 @@ var structDescs_arm64 = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res2", TypeSize: 8, ArgDir: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res3", TypeSize: 8, ArgDir: 1}}},
 	}}},
+	{Key: StructKey{Name: "msdos_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msdos_options", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodots", TypeSize: 6}, Kind: 2, Values: []string{"nodots"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dots", TypeSize: 4}, Kind: 2, Values: []string{"dots"}, NoZ: true},
+	}}},
 	{Key: StructKey{Name: "msgbuf"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msgbuf", IsVarlen: true}, Fields: []Type{
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "msgbuf_type", FldName: "typ", TypeSize: 8}}, Vals: []uint64{0, 1, 2, 3}},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "data", IsVarlen: true}},
@@ -17840,31 +17880,19 @@ var structDescs_arm64 = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "pad", TypeSize: 7}}, IsPad: true},
 	}}},
 	{Key: StructKey{Name: "vfat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vfat_options", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"iocharset\", stringnoz[codepages_names]]"}, FldName: "iocharset"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "rodir", TypeSize: 5}, Kind: 2, Values: []string{"rodir"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8no", TypeSize: 6}, Kind: 2, Values: []string{"utf8=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8", TypeSize: 6}, Kind: 2, Values: []string{"utf8=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlateno", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlate", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "numtail", TypeSize: 11}, Kind: 2, Values: []string{"nonumtail=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nonumtail", TypeSize: 12}, Kind: 2, Values: []string{"nnonumtail=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_lower", TypeSize: 15}, Kind: 2, Values: []string{"shortname=lower"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_win95", TypeSize: 15}, Kind: 2, Values: []string{"shortname=win95"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_winnt", TypeSize: 15}, Kind: 2, Values: []string{"shortname=winnt"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_mixed", TypeSize: 15}, Kind: 2, Values: []string{"shortname=mixed"}, NoZ: true},
 	}}},
 	{Key: StructKey{Name: "vhost_iotlb_msg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vhost_iotlb_msg", TypeSize: 32}, Fields: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "iova", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}},
@@ -30784,7 +30812,7 @@ var syscalls_arm64 = []*Syscall{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nsegs", TypeSize: 8}}, Buf: "segments"},
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "segments", TypeSize: 8}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_image_segment"}}}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mount_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{4096, 128, 64, 8192, 1024, 4, 2048, 8, 2, 1, 2097152, 32, 32768, 16777216, 16, 16384, 65536, 131072, 262144, 524288, 1048576, 8388608, 33554432}, BitMask: true},
-		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fs_options[vfat_options]"}}},
+		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fs_options[msdos_options]"}}},
 	}},
 	{Name: "syz_mount_image$nfs", CallName: "syz_mount_image", Args: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "fs", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 4}, Kind: 2, Values: []string{"nfs\x00"}}},
@@ -37406,4 +37434,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm64 = "728bedc655889739b342618d43782a7e012eaedb"
+const revision_arm64 = "0a388ae8da39f06f93f9dc2dceb437be93c57511"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
index 0a5094df6..4ccef52b9 100644
--- a/sys/linux/gen/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -3289,6 +3289,33 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_MARK, int16], tc_u32_mark]"}, FldName: "TCA_U32_MARK"},
 		&StructType{Key: StructKey{Name: "nlattr_t[const[TCA_U32_FLAGS, int16], int32[0:8]]"}, FldName: "TCA_U32_FLAGS"},
 	}}},
+	{Key: StructKey{Name: "fat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fat_options", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
+		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+	}}},
 	{Key: StructKey{Name: "fd_set", Dir: 2}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fd_set", TypeSize: 64, ArgDir: 2}, Fields: []Type{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask0", TypeSize: 8, ArgDir: 2}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int64", FldName: "mask1", TypeSize: 8, ArgDir: 2}}},
@@ -3532,7 +3559,7 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_loose", TypeSize: 11}, Kind: 2, Values: []string{"cache=loose"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_fscache", TypeSize: 13}, Kind: 2, Values: []string{"cache=fscache"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "cache_mmap", TypeSize: 10}, Kind: 2, Values: []string{"cache=mmap"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, FldName: "debug"},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "noextend", TypeSize: 8}, Kind: 2, Values: []string{"noextend"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodevmap", TypeSize: 8}, Kind: 2, Values: []string{"nodevmap"}, NoZ: true},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "version_9p2000", TypeSize: 14}, Kind: 2, Values: []string{"version=9p2000"}, NoZ: true},
@@ -3728,6 +3755,11 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&BufferType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", TypeSize: 4}, Kind: 1, RangeBegin: 4, RangeEnd: 4},
 	}}},
+	{Key: StructKey{Name: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
+	}}},
 	{Key: StructKey{Name: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"debug_want_extra_isize\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 22}, Kind: 2, Values: []string{"debug_want_extra_isize"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -3788,11 +3820,6 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", TypeSize: 1}}, Kind: 2, RangeBegin: 48, RangeEnd: 55}},
 	}}},
-	{Key: StructKey{Name: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"fs_opt_dec\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 10}, Kind: 2, Values: []string{"fs_opt_dec"}, NoZ: true},
-		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
-		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "val", IsVarlen: true}, Type: &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "fs_opt_digits", TypeSize: 1}}, Vals: []uint64{45, 120, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57}}},
-	}}},
 	{Key: StructKey{Name: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt[\"gid\", array[flags[fs_opt_digits, int8]]]", IsVarlen: true}, Fields: []Type{
 		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "name", TypeSize: 3}, Kind: 2, Values: []string{"gid"}, NoZ: true},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "eq", TypeSize: 1}}, Val: 61},
@@ -4173,6 +4200,10 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&UnionType{Key: StructKey{Name: "jfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
 	}}},
+	{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "msdos_options"}, FldName: "elem"},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
+	}}},
 	{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_opt_elem[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&UnionType{Key: StructKey{Name: "ntfs_options"}, FldName: "elem"},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "comma", TypeSize: 1}}, Val: 44},
@@ -4229,6 +4260,10 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[jfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
 	}}},
+	{Key: StructKey{Name: "fs_options[msdos_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[msdos_options]", IsVarlen: true}, Fields: []Type{
+		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[msdos_options]"}}},
+		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
+	}}},
 	{Key: StructKey{Name: "fs_options[ntfs_options]"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "fs_options[ntfs_options]", IsVarlen: true}, Fields: []Type{
 		&ArrayType{TypeCommon: TypeCommon{TypeName: "array", FldName: "elems", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_opt_elem[ntfs_options]"}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "null", TypeSize: 1}}},
@@ -7861,6 +7896,11 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res2", TypeSize: 8, ArgDir: 1}}},
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "res3", TypeSize: 8, ArgDir: 1}}},
 	}}},
+	{Key: StructKey{Name: "msdos_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msdos_options", IsVarlen: true}, Fields: []Type{
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nodots", TypeSize: 6}, Kind: 2, Values: []string{"nodots"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dots", TypeSize: 4}, Kind: 2, Values: []string{"dots"}, NoZ: true},
+	}}},
 	{Key: StructKey{Name: "msghdr_alg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "msghdr_alg", TypeSize: 56}, Fields: []Type{
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "addr", TypeSize: 8}}},
 		&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "addrlen", TypeSize: 4}}},
@@ -16919,31 +16959,19 @@ var structDescs_ppc64le = []*KeyedStruct{
 		&IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", FldName: "modtime", TypeSize: 8}}},
 	}}},
 	{Key: StructKey{Name: "vfat_options"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vfat_options", IsVarlen: true}, Fields: []Type{
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_relaxed", TypeSize: 13}, Kind: 2, Values: []string{"check=relaxed"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_strict", TypeSize: 12}, Kind: 2, Values: []string{"check=strict"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "check_normal", TypeSize: 12}, Kind: 2, Values: []string{"check=normal"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "usefree", TypeSize: 7}, Kind: 2, Values: []string{"usefree"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nocase", TypeSize: 6}, Kind: 2, Values: []string{"nocase"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "quiet", TypeSize: 5}, Kind: 2, Values: []string{"quiet"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "showexec", TypeSize: 8}, Kind: 2, Values: []string{"showexec"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "debug", TypeSize: 5}, Kind: 2, Values: []string{"debug"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "sys_immutable", TypeSize: 13}, Kind: 2, Values: []string{"sys_immutable"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "flush", TypeSize: 5}, Kind: 2, Values: []string{"flush"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "tz_utc", TypeSize: 6}, Kind: 2, Values: []string{"tz=UTC"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_continue", TypeSize: 15}, Kind: 2, Values: []string{"errors=continue"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "errors_remount", TypeSize: 17}, Kind: 2, Values: []string{"errors=remount-ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "discard", TypeSize: 7}, Kind: 2, Values: []string{"discard"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs", TypeSize: 3}, Kind: 2, Values: []string{"nfs"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nfs_nostale_ro", TypeSize: 14}, Kind: 2, Values: []string{"nfs=nostale_ro"}, NoZ: true},
-		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "dos1xfloppy", TypeSize: 11}, Kind: 2, Values: []string{"dos1xfloppy"}, NoZ: true},
-		&StructType{Key: StructKey{Name: "fs_opt[\"uid\", array[int8['0':'7']]]"}, FldName: "uid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"gid\", array[int8['0':'7']]]"}, FldName: "gid"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"umask\", array[int8['0':'7']]]"}, FldName: "umask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"dmask\", array[int8['0':'7']]]"}, FldName: "dmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"fmask\", array[int8['0':'7']]]"}, FldName: "fmask"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"allow_utime\", array[int8['0':'7']]]"}, FldName: "allow_utime"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"time_offset\", array[flags[fs_opt_digits, int8]]]"}, FldName: "time_offset"},
-		&StructType{Key: StructKey{Name: "fs_opt[\"codepage\", stringnoz[codepage_nums]]"}, FldName: "codepage"},
+		&UnionType{Key: StructKey{Name: "fat_options"}, FldName: "fat"},
+		&StructType{Key: StructKey{Name: "fs_opt[\"iocharset\", stringnoz[codepages_names]]"}, FldName: "iocharset"},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "rodir", TypeSize: 5}, Kind: 2, Values: []string{"rodir"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8no", TypeSize: 6}, Kind: 2, Values: []string{"utf8=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "utf8", TypeSize: 6}, Kind: 2, Values: []string{"utf8=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlateno", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "uni_xlate", TypeSize: 11}, Kind: 2, Values: []string{"uni_xlate=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "numtail", TypeSize: 11}, Kind: 2, Values: []string{"nonumtail=0"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "nonumtail", TypeSize: 12}, Kind: 2, Values: []string{"nnonumtail=1"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_lower", TypeSize: 15}, Kind: 2, Values: []string{"shortname=lower"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_win95", TypeSize: 15}, Kind: 2, Values: []string{"shortname=win95"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_winnt", TypeSize: 15}, Kind: 2, Values: []string{"shortname=winnt"}, NoZ: true},
+		&BufferType{TypeCommon: TypeCommon{TypeName: "stringnoz", FldName: "shortname_mixed", TypeSize: 15}, Kind: 2, Values: []string{"shortname=mixed"}, NoZ: true},
 	}}},
 	{Key: StructKey{Name: "vhost_iotlb_msg"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "vhost_iotlb_msg", TypeSize: 32}, Fields: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr64", FldName: "iova", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "array", ArgDir: 1, IsVarlen: true}}},
@@ -29230,7 +29258,7 @@ var syscalls_ppc64le = []*Syscall{
 		&LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "len", FldName: "nsegs", TypeSize: 8}}, Buf: "segments"},
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "segments", TypeSize: 8}, Type: &ArrayType{TypeCommon: TypeCommon{TypeName: "array", IsVarlen: true}, Type: &StructType{Key: StructKey{Name: "fs_image_segment"}}}},
 		&FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "mount_flags", FldName: "flags", TypeSize: 8}}, Vals: []uint64{4096, 128, 64, 8192, 1024, 4, 2048, 8, 2, 1, 2097152, 32, 32768, 16777216, 16, 16384, 65536, 131072, 262144, 524288, 1048576, 8388608, 33554432}, BitMask: true},
-		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fs_options[vfat_options]"}}},
+		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "opts", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "fs_options[msdos_options]"}}},
 	}},
 	{Name: "syz_mount_image$nfs", CallName: "syz_mount_image", Args: []Type{
 		&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "fs", TypeSize: 8}, Type: &BufferType{TypeCommon: TypeCommon{TypeName: "string", TypeSize: 4}, Kind: 2, Values: []string{"nfs\x00"}}},
@@ -34837,4 +34865,4 @@ var consts_ppc64le = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_ppc64le = "4b0dd8680e2388674a5e6c81256fa2c9b031a202"
+const revision_ppc64le = "df3267ccf2ff05e4e78d2c2aa7e18fd924603fd5"