Merge "Fix bogus error checking on unique_fd" am: 95587b085e

am: 3e9b69bf77

Change-Id: Id54116718b97057f978e1410a96bfb449999f832
This commit is contained in:
Bernie Innocenti 2019-03-28 21:15:34 -07:00 committed by android-build-merger
commit eb2be538c0

View file

@ -330,7 +330,7 @@ Status cp_prepareCheckpoint() {
if (fstab_rec->fs_mgr_flags.checkpoint_blk) {
android::base::unique_fd fd(
TEMP_FAILURE_RETRY(open(mount_rec.mount_point.c_str(), O_RDONLY | O_CLOEXEC)));
if (!fd) {
if (fd == -1) {
PLOG(ERROR) << "Failed to open mount point" << mount_rec.mount_point;
continue;
}