shamu: remove discard in fstab
Bug: 30807864
Change-Id: If3f67d5b7b15409c2717ef0d92851ca46677e4ff
(cherry picked from commit 6f71c79014279ef8f2e12898b8a07ae8c3ebd339)
(cherry picked from commit a02879f0e7186f62bd82acad4ba7265403a6991c)
(cherry picked from commit b76d4112b965905bc1f9962c624d5c24c680095b)
diff --git a/fstab.shamu b/fstab.shamu
index 368b422..bba200b 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
