commit e82cdd7935db15c861840a1c10beab37750acaa9
author Yurii Zubrytskyi <zyy@google.com> Wed Apr 01 12:19:26 2020 -0700
committer Yurii Zubrytskyi <zyy@google.com> Wed Apr 01 12:19:26 2020 -0700
tree f7320898afeedc596ebe62d7ef12db288372f6cc
parent 5be3a74263069e2734970a3d8b0c0b6fbc3a3e68

Use the new incfs API to open files

Bug: 152983639
Test: atest service.incremental_test
Change-Id: If33891d4699d5ddf2789ac99677a67e2b004d94e

services/incremental/ServiceWrappers.h

diff --git a/services/incremental/ServiceWrappers.h b/services/incremental/ServiceWrappers.h
index c70a47d..8114b84 100644
--- a/services/incremental/ServiceWrappers.h
+++ b/services/incremental/ServiceWrappers.h
@@ -76,7 +76,7 @@
     virtual ErrorCode link(const Control& control, std::string_view from,
                            std::string_view to) const = 0;
     virtual ErrorCode unlink(const Control& control, std::string_view path) const = 0;
-    virtual base::unique_fd openWrite(const Control& control, FileId id) const = 0;
+    virtual base::unique_fd openForSpecialOps(const Control& control, FileId id) const = 0;
     virtual ErrorCode writeBlocks(Span<const DataBlock> blocks) const = 0;
 };
 
@@ -177,8 +177,8 @@
     ErrorCode unlink(const Control& control, std::string_view path) const override {
         return incfs::unlink(control, path);
     }
-    base::unique_fd openWrite(const Control& control, FileId id) const override {
-        return base::unique_fd{incfs::openWrite(control, id)};
+    base::unique_fd openForSpecialOps(const Control& control, FileId id) const override {
+        return base::unique_fd{incfs::openForSpecialOps(control, id).release()};
     }
     ErrorCode writeBlocks(Span<const DataBlock> blocks) const override {
         return incfs::writeBlocks(blocks);