commit d9261b1f0be8866032f34aacd6a95b149f6d8045
author Daniel Rosenberg <drosen@google.com> Tue Sep 14 17:32:06 2021 -0700
committer Daniel Rosenberg <drosen@google.com> Wed Sep 22 18:08:28 2021 -0700
tree a89d2d680acdd308d57cb28fea8c0c94f0fd070c
parent 530329222f6dbba08e5ba7e7fada272912113227

Add timeout for fsck on untrusted media

Certain setups of cards can take a long time to fsck.
This adds a timeout to avoid angering the watchdog

Bug: 195615825
Test: Mount removable storage with ~30K folders,
      obeserve timeout in logs
Change-Id: I8b6e2658cf7024645f976599851bbee0557745ca

fs/Exfat.cpp

diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
index 7782dd3..c8b19e0 100644
--- a/fs/Exfat.cpp
+++ b/fs/Exfat.cpp
@@ -44,7 +44,7 @@
     cmd.push_back("-y");
     cmd.push_back(source);
 
-    int rc = ForkExecvp(cmd, nullptr, sFsckUntrustedContext);
+    int rc = ForkExecvpTimeout(cmd, kUntrustedFsckSleepTime, sFsckUntrustedContext);
     if (rc == 0) {
         LOG(INFO) << "Check OK";
         return 0;