commit e6c142174c51ebecd3d451bd92482af6709f3d35
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 04 01:45:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 04 01:45:42 2017 +0000
tree 7fdb03241f3fff9ded7ddcb2badd75918f9d1782
parent c61581e7d25dd7a736d487e4db85b61adb336144
parent a0220a5bd410d4b342ee1ca84e8381d6bc5f468e

Merge "Abort migration early when not enough space." into oc-dev

MoveTask.cpp

diff --git a/MoveTask.cpp b/MoveTask.cpp
index 38cca04..ea64a1c 100644
--- a/MoveTask.cpp
+++ b/MoveTask.cpp
@@ -128,6 +128,12 @@
     uint64_t expectedBytes = GetTreeBytes(fromPath);
     uint64_t startFreeBytes = GetFreeBytes(toPath);
 
+    if (expectedBytes > startFreeBytes) {
+        LOG(ERROR) << "Data size " << expectedBytes << " is too large to fit in free space "
+                << startFreeBytes;
+        return -1;
+    }
+
     std::vector<std::string> cmd;
     cmd.push_back(kCpPath);
     cmd.push_back("-p"); /* preserve timestamps, ownership, and permissions */

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 72d3801..443df1d 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -432,7 +432,7 @@
 uint64_t GetFreeBytes(const std::string& path) {
     struct statvfs sb;
     if (statvfs(path.c_str(), &sb) == 0) {
-        return (uint64_t)sb.f_bfree * sb.f_bsize;
+        return (uint64_t) sb.f_bavail * sb.f_frsize;
     } else {
         return -1;
     }