(SQUASHED) Revert ext4/f2fs/ntfs support for external sdcards
----------
Revert "vold: Accept Linux GPT partitions on external SD cards"
- This reverts commit 4c9b0b10431e6b0ae9b2853b4f0e858c0459e43c.
Revert "Fix the group permissions of the sdcard root."
- This reverts commit c18032ad6b5ab204c7a83dc08a114814c7f16f50.
Revert "vold ext4/f2fs: do not use dirsync if we're mounting adopted storage"
- This reverts commit c0871375fcc398ca13cf325ab11e41b38f866b25.
Revert "vold: Mount ext4/f2fs portable storage with sdcard_posix"
- This reverts commit c28dd585e6f4efa2d5be0ef65be6d17f362f7cc6.
Revert "vold: Honor mount options for ext4/f2fs partitions"
- This reverts commit 9f8b4689157a6460f6f55b88f4ffb3511a6bbf3f.
Revert "vold: Support internal storage partitions"
- This reverts commit 34e1e5dbbd9509e9410bffacbc589b74d49d56ff.
Revert "vold: Fix fsck on public volumes"
- This reverts commit 779baf99cfa4590f7847d6c7c5f8a0697e085ab7.
Revert "vold: add support for more filesystems for public storage"
- This reverts commit 16cbb8dbc85db045c359c40fc29deacfa5146386.
----------
Change-Id: Ib0eb075545490e3cb7df73bfa9d55a51262fca6a
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/model/PrivateVolume.cpp b/model/PrivateVolume.cpp
index c794a8c..3334cbb 100644
--- a/model/PrivateVolume.cpp
+++ b/model/PrivateVolume.cpp
@@ -155,7 +155,7 @@
}
if (mFsType == "ext4") {
- int res = ext4::Check(mDmDevPath, mPath, true);
+ int res = ext4::Check(mDmDevPath, mPath);
if (res == 0 || res == 1) {
LOG(DEBUG) << getId() << " passed filesystem check";
} else {
@@ -163,13 +163,13 @@
return -EIO;
}
- if (ext4::Mount(mDmDevPath, mPath, false, false, true, "", true)) {
+ if (ext4::Mount(mDmDevPath, mPath, false, false, true)) {
PLOG(ERROR) << getId() << " failed to mount";
return -EIO;
}
} else if (mFsType == "f2fs") {
- int res = f2fs::Check(mDmDevPath, true);
+ int res = f2fs::Check(mDmDevPath);
if (res == 0) {
LOG(DEBUG) << getId() << " passed filesystem check";
} else {
@@ -177,7 +177,7 @@
return -EIO;
}
- if (f2fs::Mount(mDmDevPath, mPath, "", true)) {
+ if (f2fs::Mount(mDmDevPath, mPath)) {
PLOG(ERROR) << getId() << " failed to mount";
return -EIO;
}