Merge "Fix the return values of DmTable::valid to match the expected type" am: dab6a32b2e am: dcf230ceca

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2582730

Change-Id: Ice869c22b96fd7997c7568107c51cb765adc9ad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mitchell Wills 2023-05-08 23:28:58 +00:00 committed by Automerger Merge Worker
commit 58fe332016

View file

@ -38,11 +38,11 @@ bool DmTable::RemoveTarget(std::unique_ptr<DmTarget>&& /* target */) {
bool DmTable::valid() const {
if (targets_.empty()) {
LOG(ERROR) << "Device-mapper table must have at least one target.";
return "";
return false;
}
if (targets_[0]->start() != 0) {
LOG(ERROR) << "Device-mapper table must start at logical sector 0.";
return "";
return false;
}
return true;
}