commit eb5b64f92f8d06224c4b1e2afe3425809166c0a0
author Ed Chen <chened@google.com> Tue Dec 17 08:53:13 2019 +0000
committer Ed Chen <chened@google.com> Tue Dec 17 08:53:13 2019 +0000
tree 62836409ce637e21a98e5f20544236a3c7a948e2
parent f1da6d43e35768450c3d3d35110ad96f5379a809

Revert "remount: Remove the "backing" parameter to fs_mgr_overlayfs_setup."

This reverts commit b20aa434a38e7604c42536a16ac637bfc45a2d15.

Bug: 146403375
Reason for revert: broken build 6078429 on git_master on walleye-user

Change-Id: Idc3b1c0ad5228d63298ce84811624b23d0cea434

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 81b0ca0..27971da 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -1178,7 +1178,8 @@
 
 // Returns false if setup not permitted, errno set to last error.
 // If something is altered, set *change.
-bool fs_mgr_overlayfs_setup(const char* mount_point, bool* change, bool force) {
+bool fs_mgr_overlayfs_setup(const char* backing, const char* mount_point, bool* change,
+                            bool force) {
     if (change) *change = false;
     auto ret = false;
     if (fs_mgr_overlayfs_valid() == OverlayfsValidResult::kNotSupported) return ret;
@@ -1215,6 +1216,7 @@
 
     std::string dir;
     for (const auto& overlay_mount_point : kOverlayMountPoints) {
+        if (backing && backing[0] && (overlay_mount_point != backing)) continue;
         if (overlay_mount_point == kScratchMountPoint) {
             if (!fs_mgr_overlayfs_setup_scratch(fstab, change)) continue;
         } else {

fs_mgr/fs_mgr_remount.cpp

diff --git a/fs_mgr/fs_mgr_remount.cpp b/fs_mgr/fs_mgr_remount.cpp
index 46b912b..93bba68 100644
--- a/fs_mgr/fs_mgr_remount.cpp
+++ b/fs_mgr/fs_mgr_remount.cpp
@@ -277,7 +277,7 @@
 
         auto change = false;
         errno = 0;
-        if (fs_mgr_overlayfs_setup(mount_point.c_str(), &change, just_disabled_verity)) {
+        if (fs_mgr_overlayfs_setup(nullptr, mount_point.c_str(), &change, just_disabled_verity)) {
             if (change) {
                 LOG(INFO) << "Using overlayfs for " << mount_point;
                 reboot_later = can_reboot;

fs_mgr/include/fs_mgr_overlayfs.h

diff --git a/fs_mgr/include/fs_mgr_overlayfs.h b/fs_mgr/include/fs_mgr_overlayfs.h
index 9bb222f..9a7381f 100644
--- a/fs_mgr/include/fs_mgr_overlayfs.h
+++ b/fs_mgr/include/fs_mgr_overlayfs.h
@@ -25,8 +25,8 @@
 
 bool fs_mgr_overlayfs_mount_all(android::fs_mgr::Fstab* fstab);
 std::vector<std::string> fs_mgr_overlayfs_required_devices(android::fs_mgr::Fstab* fstab);
-bool fs_mgr_overlayfs_setup(const char* mount_point = nullptr, bool* change = nullptr,
-                            bool force = true);
+bool fs_mgr_overlayfs_setup(const char* backing = nullptr, const char* mount_point = nullptr,
+                            bool* change = nullptr, bool force = true);
 bool fs_mgr_overlayfs_teardown(const char* mount_point = nullptr, bool* change = nullptr);
 bool fs_mgr_overlayfs_is_setup();
 bool fs_mgr_has_shared_blocks(const std::string& mount_point, const std::string& dev);

set-verity-state/set-verity-state.cpp

diff --git a/set-verity-state/set-verity-state.cpp b/set-verity-state/set-verity-state.cpp
index 6f2b6b1..0a26aba 100644
--- a/set-verity-state/set-verity-state.cpp
+++ b/set-verity-state/set-verity-state.cpp
@@ -101,7 +101,7 @@
   auto change = false;
   errno = 0;
   if (enable ? fs_mgr_overlayfs_teardown(mount_point, &change)
-             : fs_mgr_overlayfs_setup(mount_point, &change)) {
+             : fs_mgr_overlayfs_setup(nullptr, mount_point, &change)) {
     if (change) {
       printf("%s overlayfs for %s\n", enable ? "disabling" : "using", mount_point);
     }
@@ -132,7 +132,7 @@
   auto change = false;
   errno = 0;
   if (enable ? fs_mgr_overlayfs_teardown(nullptr, &change)
-             : fs_mgr_overlayfs_setup(nullptr, &change)) {
+             : fs_mgr_overlayfs_setup(nullptr, nullptr, &change)) {
     if (change) {
       printf("%s overlayfs\n", enable ? "disabling" : "using");
     }