commit e77298ce9fd0fbb6e94108f4c49c11f5efa856e1
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 14 15:20:47 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 14 15:20:47 2018 +0000
tree ca59dca33f1c70001fb7837cb423f0cb306b3c8d
parent af4a0e846e832a2b5729a8439e3671075901308a
parent 0790b2465ab8f2f9b0d86869a896d63358b00099

Merge "base: move TemporaryFile and TemporaryDir to android-base/file.h"

fs_mgr/liblp/builder.cpp

diff --git a/fs_mgr/liblp/builder.cpp b/fs_mgr/liblp/builder.cpp
index 6b4901b..b6d6da1 100644
--- a/fs_mgr/liblp/builder.cpp
+++ b/fs_mgr/liblp/builder.cpp
@@ -536,8 +536,8 @@
         if (group_size >= group->maximum_size() ||
             group->maximum_size() - group_size < space_needed) {
             LERROR << "Partition " << partition->name() << " is part of group " << group->name()
-                   << " which does not have enough space free (" << space_needed << "requested, "
-                   << group_size << " used out of " << group->maximum_size();
+                   << " which does not have enough space free (" << space_needed << " requested, "
+                   << group_size << " used out of " << group->maximum_size() << ")";
             return false;
         }
     }

fs_mgr/liblp/images.cpp

diff --git a/fs_mgr/liblp/images.cpp b/fs_mgr/liblp/images.cpp
index a976643..a46836e 100644
--- a/fs_mgr/liblp/images.cpp
+++ b/fs_mgr/liblp/images.cpp
@@ -120,7 +120,7 @@
         return;
     }
 
-    uint64_t num_blocks = total_size % block_size;
+    uint64_t num_blocks = total_size / block_size;
     if (num_blocks >= UINT_MAX) {
         // libsparse counts blocks in unsigned 32-bit integers, so we check to
         // make sure we're not going to overflow.