Merge "fs_mgr: fs_mgr_overlayfs_teardown_one failure to teardown scratch"

am: 30fa1b7864

Change-Id: I7a2a581d0cce4bd4b85e477529ea77893111041c
This commit is contained in:
Mark Salyzyn 2018-10-18 19:44:05 -07:00 committed by android-build-merger
commit 254cbab997

View file

@ -446,7 +446,7 @@ bool fs_mgr_overlayfs_teardown_one(const std::string& overlay, const std::string
bool* change) {
const auto top = overlay + kOverlayTopDir;
if (!fs_mgr_access(top)) return false;
if (!fs_mgr_access(top)) return fs_mgr_overlayfs_teardown_scratch(overlay, change);
auto cleanup_all = mount_point.empty();
const auto oldpath = top + (cleanup_all ? "" : ("/" + mount_point));