From c3c15e25b3a1a6909d78337d5ae23346952ee7c8 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Mon, 7 Mar 2022 17:58:16 +0000 Subject: [PATCH] system_dlkm: remove ext4 flag barrier=1 for erofs barrier=1 is ext4 flag and should not be present for erofs mount. This is wrong on the `master` due to manual merge conflict resolution and correct on the `tm-dev`. Bug: 223071475 Test: TH Signed-off-by: Ramji Jiyani Change-Id: If220e4f2334ba71dd9134067bc05c3f7f130e688 --- conf/fstab.gs201.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 2fe2161f..353d17dd 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -7,7 +7,7 @@ system /system erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 # During compliance testing, the previous line would fail (because GSI is ext4), and the next line would be used to mount GSI. system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm erofs ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_dlkm /system_dlkm erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor erofs ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128