Merge "Fix USB mount issue after GOTA upgrade" into main
diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index 38dd112..8d83541 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -17,6 +17,7 @@
#include "MetadataCrypt.h"
#include "KeyBuffer.h"
+#include <fstream>
#include <string>
#include <fcntl.h>
@@ -244,6 +245,48 @@
return true;
}
+class EncryptionInProgress {
+ private:
+ std::string file_path_;
+ bool need_cleanup_ = false;
+
+ public:
+ EncryptionInProgress(const FstabEntry& entry) {
+ file_path_ = fs_mgr_metadata_encryption_in_progress_file_name(entry);
+ }
+
+ [[nodiscard]] bool Mark() {
+ {
+ std::ofstream touch(file_path_);
+ if (!touch.is_open()) {
+ PLOG(ERROR) << "Failed to mark metadata encryption in progress " << file_path_;
+ return false;
+ }
+ need_cleanup_ = true;
+ }
+ if (!android::vold::FsyncParentDirectory(file_path_)) return false;
+
+ LOG(INFO) << "Marked metadata encryption in progress (" << file_path_ << ")";
+ return true;
+ }
+
+ [[nodiscard]] bool Remove() {
+ need_cleanup_ = false;
+ if (unlink(file_path_.c_str()) != 0) {
+ PLOG(ERROR) << "Failed to clear metadata encryption in progress (" << file_path_ << ")";
+ return false;
+ }
+ if (!android::vold::FsyncParentDirectory(file_path_)) return false;
+
+ LOG(INFO) << "Cleared metadata encryption in progress (" << file_path_ << ")";
+ return true;
+ }
+
+ ~EncryptionInProgress() {
+ if (need_cleanup_) (void)Remove();
+ }
+};
+
bool fscrypt_mount_metadata_encrypted(const std::string& blk_device, const std::string& mount_point,
bool needs_encrypt, bool should_format,
const std::string& fs_type, bool is_zoned,
@@ -334,6 +377,8 @@
}
if (needs_encrypt) {
+ EncryptionInProgress marker(*data_rec);
+ if (!marker.Mark()) return false;
if (should_format) {
status_t error;
@@ -362,6 +407,7 @@
return false;
}
}
+ if (!marker.Remove()) return false;
}
LOG(DEBUG) << "Mounting metadata-encrypted filesystem:" << mount_point;
diff --git a/fs/Ext4.cpp b/fs/Ext4.cpp
index 293efc4..800f903 100644
--- a/fs/Ext4.cpp
+++ b/fs/Ext4.cpp
@@ -68,7 +68,7 @@
const char* c_target = target.c_str();
int ret;
long tmpmnt_flags = MS_NOATIME | MS_NOEXEC | MS_NOSUID;
- char* tmpmnt_opts = (char*)"nomblk_io_submit,errors=remount-ro";
+ char* tmpmnt_opts = (char*)"errors=remount-ro";
/*
* First try to mount and unmount the filesystem. We do this because