commit 2268c285a522b91bf84697baf4e4b81c743ec33a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 20 12:09:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 20 12:09:31 2019 +0000
tree ead88aa569a02bf386e8456a219940903e826327
parent 99046b75c42effdd6f2d8c2dda85e301a3c5615c
parent db08694bb1d881f36b6c05fbaa81595ebf4b3921

Merge "Do not trim unless we are actually checkpointing"

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index c33d934..abda045 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -202,6 +202,10 @@
 }
 
 Status cp_prepareCheckpoint() {
+    if (!isCheckpointing) {
+        return Status::ok();
+    }
+
     Fstab mounts;
     if (!ReadFstabFromFile("/proc/mounts", &mounts)) {
         return Status::fromExceptionCode(EINVAL, "Failed to get /proc/mounts");