diff options
author | Mohamad Ayyash <mkayyash@google.com> | 2016-06-28 19:00:58 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-28 19:00:58 +0000 |
commit | 4919ca930ee702133a5e9bd2a6c22f44b1c8a1c8 (patch) | |
tree | 0e8ac71f56bf8d5bf46e9374833edb028492f837 | |
parent | 8b6ff69486c7897e9b58269f59a3f83611f3b5fd (diff) | |
parent | 6d78b46825b485621dda46a5b8e1e4e7a5ba928b (diff) | |
download | flounder-4919ca930ee702133a5e9bd2a6c22f44b1c8a1c8.tar.gz |
Merge \"Disable f2fs flush_merges\" into nyc-dev
am: 6d78b46825
Change-Id: I7047bee93fcfd1129325526e8957de177300f887
-rw-r--r-- | fstab.flounder | 2 |
1 files changed, 1 insertions, 1 deletions
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 |