From e97469bd14280a74e307d7a68ded391956b616f5 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Wed, 29 Aug 2018 10:44:33 -0700
Subject: [PATCH] fs_mgr: fs_mgr_overlayfs_teardown_one failure to teardown
 scratch

If fs_mgr_overlayfs_teardown_one can not access the top directory,
then we should teardown the scratch volume.

Test: manual
Bug: 109821105
Change-Id: Ic86e10f1af1be354242fc004a95cac92d77619a6
---
 fs_mgr/fs_mgr_overlayfs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 767b73a67..6067a7dd2 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -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));