| commit | e289c7483a29fb7be8d1c8c27b9a701332c2f339 | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Thu Jul 13 21:58:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 13 21:58:52 2023 +0000 |
| tree | 01b10743ad28304440c6cabcc9b55f7583af0218 | |
| parent | bb9051943cbf6c8a359865470bb4cf396b257462 [diff] | |
| parent | bb235ebf48f8f58836aa8a9cf9ae05adc829e734 [diff] |
Merge "snapuserd: Fix bool/int return value mismatches." into main am: bb235ebf48 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2654185 Change-Id: I575b68c57298b661357c0bc423609582b1f84928 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_dm_user.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_dm_user.cpp index 1b17698..2b9d14e 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_dm_user.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_dm_user.cpp
@@ -585,7 +585,7 @@ // Unaligned I/O request if (!IsBlockAligned(header->sector << SECTOR_SHIFT)) { - return ReadUnalignedSector(header->sector, header->len) != -1; + return ReadUnalignedSector(header->sector, header->len); } return ReadAlignedSector(header->sector, header->len);