marlin: remove discard in fstab

Bug: 30807864 Change-Id: If212f5f7de181cab308c4206de523f1dc8b46907
nychitman1 · Aug 22, 2016 · dafbec6 · dafbec6
1 parent 7a749e7
commit dafbec6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fstab.aosp_common b/fstab.aosp_common
@@ -9,7 +9,7 @@
 /dev/block/bootdevice/by-name/system    /           ext4    ro,barrier=1,discard                                wait,slotselect,verify
 /dev/block/bootdevice/by-name/vendor    /vendor     ext4    ro,barrier=1,discard                                wait,slotselect
 /dev/block/bootdevice/by-name/modem     /firmware/radio    vfat    ro,shortname=lower,uid=1000,gid=0,dmask=227,fmask=337,context=u:object_r:firmware_file:s0   wait,slotselect
-/dev/block/bootdevice/by-name/userdata    /data             ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check,formattable,fileencryption=ice
+/dev/block/bootdevice/by-name/userdata    /data             ext4    nosuid,nodev,barrier=1,noauto_da_alloc      wait,check,formattable,fileencryption=ice
 /dev/block/zram0                        none              swap    defaults                                            zramsize=536870912
 /dev/block/bootdevice/by-name/misc        /misc           emmc  defaults defaults
 /devices/*/xhci-hcd.0.auto/usb*           auto              vfat    defaults                                            voldmanaged=usb:auto
diff --git a/fstab.common b/fstab.common
@@ -9,7 +9,7 @@
 /dev/block/bootdevice/by-name/system    /           ext4    ro,barrier=1,discard                                wait,slotselect,verify
 /dev/block/bootdevice/by-name/vendor    /vendor     ext4    ro,barrier=1,discard                                wait,slotselect,verify
 /dev/block/bootdevice/by-name/modem     /firmware/radio    vfat    ro,shortname=lower,uid=1000,gid=0,dmask=227,fmask=337,context=u:object_r:firmware_file:s0   wait,slotselect
-/dev/block/bootdevice/by-name/userdata    /data             ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check,formattable,fileencryption=ice
+/dev/block/bootdevice/by-name/userdata    /data             ext4    nosuid,nodev,barrier=1,noauto_da_alloc      wait,check,formattable,fileencryption=ice
 /dev/block/zram0                        none              swap    defaults                                            zramsize=536870912
 /dev/block/bootdevice/by-name/misc        /misc           emmc  defaults defaults
 /devices/*/xhci-hcd.0.auto/usb*           auto              vfat    defaults                                            voldmanaged=usb:auto