From d8b67f49d7f8ae291cd4fa901b2d3767137704e7 Mon Sep 17 00:00:00 2001 From: Amin Hassani Date: Wed, 6 Dec 2017 13:47:52 -0800 Subject: update_engine: Remove the duplicate BlocksInExtents This patch removes the duplicate BlocksInExtents from extent_utils.h and fixes the remainder of the code to reflect this change. BUG=none TEST=unittests pass; Change-Id: I76f5106f75072b20cd8f41f081b2f2b07aeac9a8 Reviewed-on: https://chromium-review.googlesource.com/812009 Commit-Ready: Amin Hassani Tested-by: Amin Hassani Reviewed-by: Ben Chan Reviewed-by: Alex Deymo Reviewed-by: Sen Jiang --- payload_generator/ext2_filesystem.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'payload_generator/ext2_filesystem.cc') diff --git a/payload_generator/ext2_filesystem.cc b/payload_generator/ext2_filesystem.cc index b8840219..07ec3710 100644 --- a/payload_generator/ext2_filesystem.cc +++ b/payload_generator/ext2_filesystem.cc @@ -18,7 +18,7 @@ #include #if defined(__clang__) -// TODO: Remove these pragmas when b/35721782 is fixed. +// TODO(*): Remove these pragmas when b/35721782 is fixed. #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wmacro-redefined" #endif @@ -348,7 +348,7 @@ bool Ext2Filesystem::LoadSettings(brillo::KeyValueStore* store) const { return false; brillo::Blob blob; - uint64_t physical_size = BlocksInExtents(extents) * filsys_->blocksize; + uint64_t physical_size = utils::BlocksInExtents(extents) * filsys_->blocksize; // Sparse holes in the settings file are not supported. if (EXT2_I_SIZE(&ino_data) > physical_size) return false; -- cgit v1.2.3