commit 8dd1ef12358e1c34a3ec6d5c8558ea1cdc9065eb
author Kelvin Zhang <zhangkelvin@google.com> Fri Aug 09 13:02:24 2024 -0700
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 09 23:44:11 2024 +0000
tree 00732b3fb002b138ba353a6b20a21ffb51cc98ae
parent ad1eaead8fc9e990d8953b2e548e5da0d35003e1

Migrate to erofs-utils v1.8

Test: th

Change-Id: I83a24fbd80d422555e61ec6e30ef473a27f04fea

lz4diff/lz4diff_compress_unittest.cc

diff --git a/lz4diff/lz4diff_compress_unittest.cc b/lz4diff/lz4diff_compress_unittest.cc
index d05c6be..9caa9a3 100644
--- a/lz4diff/lz4diff_compress_unittest.cc
+++ b/lz4diff/lz4diff_compress_unittest.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
+#include <fcntl.h>
 #include <unistd.h>
 
 #include <algorithm>
-#include <mutex>
 #include <string>
 #include <vector>
 
@@ -48,10 +48,10 @@
                               const char* inode_path,
                               Blob* output) {
   struct erofs_sb_info sbi {};
-  auto err = dev_open_ro(&sbi, erofs_image);
+  auto err = erofs_dev_open(&sbi, erofs_image, O_RDONLY);
   ASSERT_EQ(err, 0);
   DEFER {
-    dev_close(&sbi);
+    erofs_dev_close(&sbi);
   };
 
   err = erofs_read_superblock(&sbi);

payload_generator/erofs_filesystem.cc

diff --git a/payload_generator/erofs_filesystem.cc b/payload_generator/erofs_filesystem.cc
index 32a5fc5..2835dea 100644
--- a/payload_generator/erofs_filesystem.cc
+++ b/payload_generator/erofs_filesystem.cc
@@ -175,12 +175,12 @@
   }
   struct erofs_sb_info sbi {};
 
-  if (const auto err = dev_open_ro(&sbi, filename.c_str()); err) {
+  if (const auto err = erofs_dev_open(&sbi, filename.c_str(), O_RDONLY); err) {
     PLOG(INFO) << "Failed to open " << filename;
     return nullptr;
   }
   DEFER {
-    dev_close(&sbi);
+    erofs_dev_close(&sbi);
   };
 
   if (const auto err = erofs_read_superblock(&sbi); err) {
@@ -189,7 +189,7 @@
   }
   const auto block_size = 1UL << sbi.blkszbits;
   struct stat st {};
-  if (const auto err = fstat(sbi.devfd, &st); err) {
+  if (const auto err = stat(filename.c_str(), &st); err) {
     PLOG(ERROR) << "Failed to stat() " << filename;
     return nullptr;
   }