fix: blkid adoptable storage
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
nyyu 2023-01-08 13:43:52 +01:00
parent e60e8fa9d7
commit 61e04ffc20

View file

@ -5,9 +5,23 @@ Subject: [PATCH] vold: add option ^metadata_csum
Change-Id: I1fe379967968e4be8973e98c4fcb9b5c95bb60e8
---
Utils.cpp | 2 +-
fs/Ext4.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Utils.cpp b/Utils.cpp
index a7e85f2..9ffc1dd 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -644,7 +644,7 @@ static status_t readMetadata(const std::string& path, std::string* fsType, std::
cmd.push_back(path);
std::vector<std::string> output;
- status_t res = ForkExecvp(cmd, &output, untrusted ? sBlkidUntrustedContext : sBlkidContext);
+ status_t res = ForkExecvp(cmd, &output/*, untrusted ? sBlkidUntrustedContext : sBlkidContext*/);
if (res != OK) {
LOG(WARNING) << "blkid failed to identify " << path;
return res;
diff --git a/fs/Ext4.cpp b/fs/Ext4.cpp
index 0ae5cb3..59c04d3 100644
--- a/fs/Ext4.cpp