aboutsummaryrefslogtreecommitdiffstats
path: root/sys/linux/filesystem.txt
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-06-11 10:02:51 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-06-11 12:12:01 +0300
commitdeb0e69e1028ba3152631c3f1d2fac98c12e33a5 (patch)
tree376f668a931b30657534770b00405c23588e8839 /sys/linux/filesystem.txt
parent9cff2eb96ab1d23a15740ee9e0161078b8fd01f1 (diff)
executor: always use errors=continue when mounting ext2/3/4
For ext2/3/4 we have to have errors=continue because the image can contain errors=panic flag and can legally crash kernel. Fixes #599
Diffstat (limited to 'sys/linux/filesystem.txt')
-rw-r--r--sys/linux/filesystem.txt9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/linux/filesystem.txt b/sys/linux/filesystem.txt
index bbd6a0769..c9460adf5 100644
--- a/sys/linux/filesystem.txt
+++ b/sys/linux/filesystem.txt
@@ -16,7 +16,7 @@ syz_mount_image$msdos(fs ptr[in, string["msdos"]], dir ptr[in, filename], size i
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])
-syz_mount_image$xfs(fs ptr[in, string["xfs"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts ptr[in, xfs_full_options])
+syz_mount_image$xfs(fs ptr[in, string["xfs"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts ptr[in, xfs_options])
syz_mount_image$minix(fs ptr[in, string["minix"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts const[0])
@@ -113,13 +113,6 @@ vfat_options [
codepage fs_opt_cp_num["codepage"]
] [varlen]
-xfs_full_options {
-# We always set nouuid because xfs has a global table uuids and if two parallel
-# executors mounts fs with the same uuid, second mount fails.
- nouuid stringnoz["nouuid,"]
- options fs_options[xfs_options]
-}
-
xfs_options [
wsync stringnoz["wsync"]
noalign stringnoz["noalign"]