diff options
| author | Drgravy <drg113001@gmail.com> | 2016-12-02 09:15:20 +0530 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@Ubuntu-1604-xenial-64-minimal> | 2016-12-02 09:15:20 +0530 |
| commit | 1840209d3cb45d4e201fcb844c42e49032dbd06a (patch) | |
| tree | 1cd3cccead5792deace974c3a0913b0667acb8e0 | |
| parent | 177962f5bf5e87332da015c7ce544c169d4213e4 (diff) | |
| parent | 05ab1b684897ae4979c0079d6e5a157cd85a6304 (diff) | |
Merge "Revert "g2-common: Disable flush_merge for f2fs" This breaks f2fs" into n7.1
| -rw-r--r-- | rootdir/etc/fstab.g2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rootdir/etc/fstab.g2 b/rootdir/etc/fstab.g2 index cc050e5..e0b3ef2 100644 --- a/rootdir/etc/fstab.g2 +++ b/rootdir/etc/fstab.g2 @@ -10,9 +10,9 @@ /dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults /dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,barrier=1 wait /dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,errors=continue,journal_async_commit wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/encrypt -/dev/block/platform/msm_sdcc.1/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,noflush_merge wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/encrypt +/dev/block/platform/msm_sdcc.1/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/encrypt /dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 nosuid,nodev,barrier=1,noauto_da_alloc,errors=continue,journal_async_commit wait -/dev/block/platform/msm_sdcc.1/by-name/cache /cache f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,noflush_merge wait,check +/dev/block/platform/msm_sdcc.1/by-name/cache /cache f2fs rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr wait,check /dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 nosuid,nodev,barrier=1,noauto_da_alloc,errors=continue wait,notrim /dev/block/platform/msm_sdcc.1/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait /dev/block/platform/msm_sdcc.1/by-name/sns /sns ext4 nosuid,nodev,barrier=1,noauto_da_alloc,errors=continue wait,notrim |