diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2018-01-20 06:50:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-20 06:50:59 +0000 |
| commit | 5bf17d29988add9cf84c68dd658989f2d869d1d6 (patch) | |
| tree | 1ddbf4b8212e10ffe5fc74738d1651dee316ce06 | |
| parent | 15bb8b19a2067258a492753d16e8928e8ce64386 (diff) | |
| parent | ef701b2044c89e7acc899bd9b9a30efc04fb26d2 (diff) | |
| download | hikey-5bf17d29988add9cf84c68dd658989f2d869d1d6.tar.gz | |
hikey/hikey960: Remove 'discard' mount option mentioned twice am: 6a6be172d3 am: 6507f593cd
am: ef701b2044
Change-Id: I6f349c3573ecd58ced44355260cc0baa2e66b9e8
| -rw-r--r-- | hikey/fstab.hikey | 8 | ||||
| -rw-r--r-- | hikey/fstab.hikey-3.18 | 8 | ||||
| -rw-r--r-- | hikey960/fstab.hikey960 | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/hikey/fstab.hikey b/hikey/fstab.hikey index a2458eb6..547fe30a 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 diff --git a/hikey/fstab.hikey-3.18 b/hikey/fstab.hikey-3.18 index ceab636d..3a71aba3 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 diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index d4de1fc7..0cb7c5fb 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 |