diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-10-01 18:31:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-01 18:31:05 +0000 |
| commit | 2328f598c0a16261e64768c361ae81aa25d7f949 (patch) | |
| tree | 211a82674fd9aaaeaa9da39d8053197beee39295 | |
| parent | c6efa5d4e7acd3c11ff4aebea794800edc2d74a6 (diff) | |
| parent | a02879f0e7186f62bd82acad4ba7265403a6991c (diff) | |
| download | shamu-2328f598c0a16261e64768c361ae81aa25d7f949.tar.gz | |
Merge "shamu: remove discard in fstab" into nyc-mr1-dev
| -rw-r--r-- | fstab.shamu | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fstab.shamu b/fstab.shamu index 368b4221..bba200bd 100644 --- a/fstab.shamu +++ b/fstab.shamu @@ -4,8 +4,8 @@ # #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> /dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,barrier=1 wait,verify=/dev/block/platform/msm_sdcc.1/by-name/metadata -/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 rw,nosuid,nodev,noatime,discard,nodiratime,noauto_da_alloc,nobarrier wait,check,formattable,forceencrypt=/dev/block/platform/msm_sdcc.1/by-name/metadata -/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 rw,noatime,nosuid,nodev,discard,barrier=1,data=ordered wait,check,formattable +/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 rw,nosuid,nodev,noatime,nodiratime,noauto_da_alloc,nobarrier wait,check,formattable,forceencrypt=/dev/block/platform/msm_sdcc.1/by-name/metadata +/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 rw,noatime,nosuid,nodev,barrier=1,data=ordered wait,check,formattable /dev/block/platform/msm_sdcc.1/by-name/modem /firmware ext4 ro,barrier=1,context=u:object_r:firmware_file:s0 wait /dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 rw,nosuid,nodev,barrier=1 wait,check,notrim /dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults |