commit 6507f593cdc2e31dbc232eda11aa1d8db9d8adb5
author Dmitry Shmidt <dimitrysh@google.com> Sat Jan 20 06:45:26 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 20 06:45:26 2018 +0000
tree 226bed8d1c6617388e4462fe693294872acbdca3
parent ec88521be53e60a059ad718cd5c81fdf1fc55505
parent 6a6be172d3ca525ee99b20453dc747073d1fded4

hikey/hikey960: Remove 'discard' mount option mentioned twice
am: 6a6be172d3

Change-Id: Icfe039151a67a7b22aa3b48824ea4be862bc1981

hikey/fstab.hikey

diff --git a/hikey/fstab.hikey b/hikey/fstab.hikey
index a2458eb..547fe30 100644
--- a/hikey/fstab.hikey
+++ b/hikey/fstab.hikey
@@ -3,9 +3,9 @@
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
-/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,discard,barrier=1    wait
-/dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
+/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               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 ceab636..3a71aba 100644
--- a/hikey/fstab.hikey-3.18
+++ b/hikey/fstab.hikey-3.18
@@ -3,9 +3,9 @@
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
-/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,discard,barrier=1    wait
-/dev/block/platform/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
+/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               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

hikey960/fstab.hikey960

diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960
index d4de1fc..0cb7c5f 100644
--- a/hikey960/fstab.hikey960
+++ b/hikey960/fstab.hikey960
@@ -5,9 +5,9 @@
 
 #/dev/block/platform/soc/ff3b0000.ufs/by-name/system_a    /system    ext4    ro                                                                   wait
 /dev/block/sdd10    /system    ext4    ro                                                                   wait
-#/dev/block/platform/soc/ff3b0000.ufs/by-name/cache       /cache     ext4    discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
-/dev/block/sdd5     /cache     ext4    discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
-#/dev/block/platform/soc/ff3b0000.ufs/by-name/userdata    /data      ext4    discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
-/dev/block/sdd13    /data      ext4    discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
+#/dev/block/platform/soc/ff3b0000.ufs/by-name/cache       /cache     ext4    discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
+/dev/block/sdd5     /cache     ext4    discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
+#/dev/block/platform/soc/ff3b0000.ufs/by-name/userdata    /data      ext4    discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
+/dev/block/sdd13    /data      ext4    discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
 /devices/platform/soc/ff37f000.dwmmc1/mmc_host/mmc*      auto       auto    defaults    voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/platform/soc/ff200000.hisi_usb/ff100000.dwc3/xhci-hcd.*.auto/usb*               auto               auto      defaults  voldmanaged=usbdisk:auto,encryptable=userdata