commit eb2be538c070f00a09c69274d8de294e43346c70
author Bernie Innocenti <codewiz@google.com> Thu Mar 28 21:15:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 28 21:15:34 2019 -0700
tree 25ba5d14f9743f84d09b2d35b7b6dc26ef8f1586
parent 2cc875293556b87cad330c08db34d42de3f6de0e
parent 3e9b69bf777ab5526c14c30d52328bbaa762c1ef

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

Change-Id: Id54116718b97057f978e1410a96bfb449999f832

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index e060230..8605b6a 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -330,7 +330,7 @@
         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;
             }