commit cb05302eddd1b2f1927f17f84fd7255d1ecf9c91
author Dmitry Shmidt <dimitrysh@google.com> Tue Jan 23 02:28:28 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 23 02:28:28 2018 +0000
tree c2c1f0e11a9d14c0323b07d925dde0e0f9fef2dd
parent cbd6d34bf2be0ac222c9a2df03684ef7021c9a77
parent 62f8782727ab023d9e6ecf6735b1703e8aafd67b

Merge "hikey: Allow userdata f2fs mount" am: 8d1daf4478
am: 62f8782727

Change-Id: If74bd70c2d3d4dcee5ab83783c9b72783a64b04d

hikey/fstab.hikey

diff --git a/hikey/fstab.hikey b/hikey/fstab.hikey
index 547fe30..def00f6 100644
--- a/hikey/fstab.hikey
+++ b/hikey/fstab.hikey
@@ -6,6 +6,7 @@
 /dev/block/platform/soc/f723d000.dwmmc0/by-name/system      /system             ext4      ro                                                           wait
 /dev/block/platform/soc/f723d000.dwmmc0/by-name/system      /system             squashfs  ro                                                           wait
 /dev/block/platform/soc/f723d000.dwmmc0/by-name/cache       /cache              ext4      discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
+/dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata    /data               f2fs      discard,noatime,nosuid,nodev                                 wait,check,fileencryption=software,quota
 /dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
 /devices/platform/soc/f723e000.dwmmc1/mmc_host/mmc*                   auto               auto      defaults  voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/platform/soc/f72c0000.usb/usb*               auto               auto      defaults  voldmanaged=usbdisk:auto,encryptable=userdata

hikey/fstab.hikey-3.18

diff --git a/hikey/fstab.hikey-3.18 b/hikey/fstab.hikey-3.18
index 3a71aba..b652d75 100644
--- a/hikey/fstab.hikey-3.18
+++ b/hikey/fstab.hikey-3.18
@@ -6,6 +6,7 @@
 /dev/block/platform/f723d000.dwmmc0/by-name/system      /system             ext4      ro                                                           wait
 /dev/block/platform/f723d000.dwmmc0/by-name/system      /system             squashfs  ro                                                           wait
 /dev/block/platform/f723d000.dwmmc0/by-name/cache       /cache              ext4      discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
+/dev/block/platform/f723d000.dwmmc0/by-name/userdata    /data               f2fs      discard,noatime,nosuid,nodev                                 wait,check,fileencryption=software,quota
 /dev/block/platform/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
 /devices/platform/f723e000.dwmmc1/mmc_host/mmc*                   auto               auto      defaults  voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/platform/f72c0000.usb/usb*               auto               auto      defaults  voldmanaged=usbdisk:auto,encryptable=userdata