【SDM660】Android13 userdata区文件系统f2fs换为ext4

【需求描述】：
Android平台默认的userdata文件系统格式是f2fs，需求需要修改为ext4格式。
【修改方案】：
device/qcom/sdm660_64/BoardConfig.mk文件修改如下：

diff --git a/device/qcom/sdm660_64/BoardConfig.mk b/device/qcom/sdm660_64/BoardConfig.mk
index 180ff6223..427ba6893 100755
--- a/device/qcom/sdm660_64/BoardConfig.mk
+++ b/device/qcom/sdm660_64/BoardConfig.mk
@@ -40,7 +40,7 @@ BOARD_USE_LEGACY_UI := true
 TARGET_USERIMAGES_USE_EXT4 := true
 ifeq ($(strip $(BOARD_DYNAMIC_PARTITION_ENABLE)),true)
     TARGET_USERIMAGES_USE_F2FS := true
-    BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
+    BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 endif
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000

项目硬件配置是EMCP，device/qcom/sdm660_64/default/fstab_AB_dynamic_partition_variant.qti文件修改如下：

diff --git a/device/qcom/sdm660_64/default/fstab_AB_dynamic_partition_variant.qti b/device/qcom/sdm660_64/default/fstab_AB_dynamic_partition_variant.qti
index 4998463a9..49af3207e 100755
--- a/device/qcom/sdm660_64/default/fstab_AB_dynamic_partition_variant.qti
+++ b/device/qcom/sdm660_64/default/fstab_AB_dynamic_partition_variant.qti
@@ -36,7 +36,8 @@ system_ext                               /system_ext           ext4   ro,barrier
 product                                  /product              ext4   ro,barrier=1,discard                             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
 vendor                                   /vendor               ext4   ro,barrier=1,discard                             wait,slotselect,avb,logical,first_stage_mount
 /dev/block/by-name/metadata              /metadata             ext4   noatime,nosuid,nodev,discard                     wait,check,formattable,first_stage_mount
-/dev/block/bootdevice/by-name/userdata   /data                 f2fs   nosuid,nodev,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,discard,noatime,lazytime,inlinecrypt   latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,metadata_encryption=aes-256-xts,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,checkpoint=fs
+#/dev/block/bootdevice/by-name/userdata   /data                 f2fs   nosuid,nodev,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,discard,noatime,lazytime,inlinecrypt   latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,metadata_encryption=aes-256-xts,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,checkpoint=fs
+/dev/block/bootdevice/by-name/userdata   /data                 ext4   nosuid,nodev,discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1   latemount,wait,check,formattable,fileencryption=software,quota,reservedsize=128M,checkpoint=block
 /dev/block/bootdevice/by-name/misc       /misc                 emmc   defaults                                         defaults
 /dev/block/bootdevice/by-name/modem      /vendor/firmware_mnt  vfat   ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
 /dev/block/bootdevice/by-name/bluetooth  /vendor/bt_firmware   vfat   ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect

device/qcom/sdm660_64/recovery_AB_dynamic_variant.fstab文件修改如下：

diff --git a/device/qcom/sdm660_64/recovery_AB_dynamic_variant.fstab b/device/qcom/sdm660_64/recovery_AB_dynamic_variant.fstab
index 7d1406881..728327911 100644
--- a/device/qcom/sdm660_64/recovery_AB_dynamic_variant.fstab
+++ b/device/qcom/sdm660_64/recovery_AB_dynamic_variant.fstab
@@ -33,7 +33,7 @@ system                                     /system         ext4    ro,barrier=1,
 system_ext                                 /system_ext     ext4    ro,barrier=1,discard                                            wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
 product                                    /product        ext4    ro,barrier=1,discard                                            wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
 vendor                                     /vendor         ext4    ro,barrier=1,discard                                            wait,slotselect,avb,logical,first_stage_mount
-/dev/block/bootdevice/by-name/userdata     /data           f2fs    noatime,nosuid,nodev,discard                                    wait,check,encryptable=footer
+/dev/block/bootdevice/by-name/userdata     /data           ext4    noatime,nosuid,nodev,discard                                    wait,check,encryptable=footer
 /dev/block/bootdevice/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,discard                                    wait,check,formattable,wrappedkey
 /dev/block/mmcblk1p1                       /sdcard         vfat    nosuid,nodev                                                    wait
 /dev/block/bootdevice/by-name/boot         /boot           emmc    defaults                                                        defaults