Fix's

recovery/root/etc/recovery.fstab

@@ -1,18 +1,18 @@
-/system_root    ext4    /dev/block/by-name/system    flags=display="System";backup=1
-/system_image   emmc    /dev/block/by-name/system    flags=display="System Image";backup=1
-/cache          ext4    /dev/block/by-name/cache     flags=display="Cache";backup=1
-/data           f2fs    /dev/block/by-name/userdata  flags=encryptable=footer;backup=1
-/boot           emmc    /dev/block/by-name/boot      flags=display="Boot";backup=1
-/recovery       emmc    /dev/block/by-name/recovery  flags=display="Recovery";backup=1
-/firmware_mnt   vfat    /dev/block/by-name/modem     flags=display="Modem";backup=1
-/persistent     emmc    /dev/block/by-name/config    flags=display="FRP";backup=1
-/misc           emmc    /dev/block/by-name/misc      flags=display="Misc";backup=1
-/vendor         ext4    /dev/block/by-name/vendor    flags=display="Vendor";backup=1
-/vendor_image   emmc    /dev/block/by-name/vendor    flags=display="Vendor Image";backup=1
-/oem            emmc    /dev/block/by-name/oem       flags=display="oem";backup=1
-/aboot          emmc    /dev/block/by-name/aboot     flags=display="Fastboot";backup=1
-/cmnlib         emmc    /dev/block/by-name/cmnlib    flags=display="cmnlib";backup=1
-/keymaster      emmc    /dev/block/by-name/keymaster flags=display="keymaster";backup=1
-/rpm            emmc    /dev/block/by-name/rpm       flags=display="rpm";backup=1
-/sbl1           emmc    /dev/block/by-name/sbl1      flags=display="sbl1";backup=1
-/tz             emmc    /dev/block/by-name/tz        flags=display="tz";backup=1
+# mount point  fstype device                             device2              flags
+/boot          emmc   /dev/block/by-name/boot
+/cache         ext4   /dev/block/by-name/cache
+/recovery      emmc   /dev/block/by-name/recovery                     flags=backup=1
+/system_root        ext4   /dev/block/by-name/system
+/vendor        ext4   /dev/block/by-name/vendor                       flags=backup=1;display="Vendor"
+
+/system_image  emmc   /dev/block/by-name/system
+/vendor_image  emmc   /dev/block/by-name/vendor
+
+/data          ext4   /dev/block/by-name/userdata                     flags=encryptable=footer;fileencryption=ice:aes-256-cts
+/vendor/firmware_mnt      vfat   /dev/block/by-name/modem             flags=display="Firmware";mounttodecrypt
+/oem          ext4   /dev/block/by-name/oem                         flags=display="OEM"
+/misc          emmc   /dev/block/by-name/misc
+/modem         emmc   /dev/block/by-name/modem                        flags=backup=1;display="Modem"
+/bluetooth     emmc   /dev/block/by-name/bluetooth                    flags=backup=1;subpartitionof=/modem
+/frp           emmc   /dev/block/by-name/config                          flags=backup=1;subpartitionof=/modem
+/persist       ext4   /dev/block/by-name/persist                      flags=display="Persist"

recovery/root/etc/twrp.fstab

@@ -8,14 +8,14 @@
 #<src>                                      <mnt_point>      <type>  <mnt_flags and options>                     <fs_mgr_flags>
 /dev/block/by-name/system        /system_root                ext4    rw,barrier=1,discard                        wait
 /dev/block/by-name/vendor    /vendor           ext4    noatime,nosuid,nodev,barrier=1                                                               wait
-#/dev/block/by-name/userdata      /data            f2fs    noatime,nosuid,nodev,discard                latemount,wait,fileencryption=ice,quota,reservedsize=128M
 /dev/block/by-name/config        /frp             emmc    defaults                                    defaults
 /dev/block/by-name/misc          /misc            emmc    defaults                                    defaults
+/dev/block/by-name/boot          /boot            emmc    defaults                                    defaults
+/dev/block/by-name/recovery          /recovery            emmc    defaults                                    defaults
 /dev/block/by-name/cache         /cache           ext4    noatime,nosuid,nodev,barrier=1              wait
 /dev/block/by-name/modem         /vendor/firmware_mnt        vfat    rw,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait
 /dev/block/by-name/dsp           /vendor/dsp                 ext4    rw,nosuid,nodev,barrier=1                   wait
 /dev/block/by-name/persist       /persist        ext4    noatime,nosuid,nodev,barrier=1                   wait,notrim
 /dev/block/by-name/oem           /oem             ext4    rw,context=u:object_r:oemfs:s0,nosuid,nodev    wait
 /dev/block/zram0                            none             swap    defaults                                     zramsize=268435456,swapprio=32758
-#/dev/block/mmcblk1p1                       /sdcard         vfat    nosuid,nodev                                                    wait
 /dev/block/by-name/userdata     /data           f2fs    noatime,nosuid,nodev,discard					   wait,check,encryptable=footer,fileencryption=ice:aes-256-cts