commit dcc604e5a7cb7dd79f2d4e78986855de55e7d63a
author Mohamad Ayyash <mkayyash@google.com> Tue Jun 28 11:18:49 2016 -0700
committer Mohamad Ayyash <mkayyash@google.com> Tue Jun 28 11:18:49 2016 -0700
tree 60bf40b336ebd9fef06689b0d8204c4336fa8c1f
parent 8aad1a4f1ebca44179a4ba264f209ded8dfcfb18

Disable f2fs flush_merges

BUG: 29760042
Change-Id: I77e1e1276bf985fc2d28cb5a6b25a86ff1dfe93a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>

fstab.flounder

diff --git a/fstab.flounder b/fstab.flounder
index 0894549..518becd 100644
--- a/fstab.flounder
+++ b/fstab.flounder
@@ -6,7 +6,7 @@
 /dev/block/platform/sdhci-tegra.3/by-name/APP   /system             ext4      ro                                                    wait,verify=/dev/block/platform/sdhci-tegra.3/by-name/MD1
 /dev/block/platform/sdhci-tegra.3/by-name/VNR   /vendor             ext4      ro                                                    wait,verify=/dev/block/platform/sdhci-tegra.3/by-name/MD1
 /dev/block/platform/sdhci-tegra.3/by-name/CAC   /cache              ext4      noatime,nosuid,nodev,nomblk_io_submit,discard,errors=panic    wait,check
-/dev/block/platform/sdhci-tegra.3/by-name/UDA   /data               f2fs      noatime,discard,flush_merge,nosuid,nodev,errors=panic    wait,check,forceencrypt=/dev/block/platform/sdhci-tegra.3/by-name/MD1
+/dev/block/platform/sdhci-tegra.3/by-name/UDA   /data               f2fs      noatime,discard,nosuid,nodev,errors=panic    wait,check,forceencrypt=/dev/block/platform/sdhci-tegra.3/by-name/MD1
 /dev/block/platform/sdhci-tegra.3/by-name/UDA   /data               ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait,check,forceencrypt=/dev/block/platform/sdhci-tegra.3/by-name/MD1
 /dev/block/platform/sdhci-tegra.3/by-name/LNX   /boot               emmc      defaults                                              defaults
 /dev/block/platform/sdhci-tegra.3/by-name/SOS   /recovery           emmc      defaults                                              defaults