Retry unmounts in ext4 encryption
Bug: 18151196
Change-Id: I52ca23b2ce3adcff44bd003d4a12243a0bd6ac34
diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 9c79098..150014c 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -381,16 +381,14 @@
std::string tmp_path = std::string() + path + "/tmp_mnt";
- // ext4enc:TODO add retry logic
- rc = umount(tmp_path.c_str());
+ rc = wait_and_unmount(tmp_path.c_str(), true);
if (rc) {
SLOGE("umount %s failed with rc %d, msg %s",
tmp_path.c_str(), rc, strerror(errno));
return rc;
}
- // ext4enc:TODO add retry logic
- rc = umount(path);
+ rc = wait_and_unmount(path, true);
if (rc) {
SLOGE("umount %s failed with rc %d, msg %s",
path, rc, strerror(errno));