commit 60f121b389b63faa32b2d02b8a9f469fb02a917e
author LongPing.WEI <weilongping@huawei.com> Wed Nov 28 10:03:09 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 28 10:03:09 2018 -0800
tree f3c58f4fd0032eedfda46622f05d918b9f040e2b
parent 6a1c15cf5bc426fed5345e0e90855cba3f253a8a
parent 2255cf528f4553695cea72fccbddac23ee4e8a87

Merge "Use setmntent with "e" option" am: 396040ca2c am: a92bdeb7f5
am: 2255cf528f

Change-Id: Ibc84f3b9d2dc8ab0707b354d64529434355f36d6

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index f7afde5..57417d6 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -767,7 +767,7 @@
 }
 
 status_t UnmountTree(const std::string& prefix) {
-    FILE* fp = setmntent("/proc/mounts", "r");
+    FILE* fp = setmntent("/proc/mounts", "re");
     if (fp == NULL) {
         PLOG(ERROR) << "Failed to open /proc/mounts";
         return -errno;

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index f3604ee..aeab4f8 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -1221,7 +1221,7 @@
 
     // Worst case we might have some stale mounts lurking around, so
     // force unmount those just to be safe.
-    FILE* fp = setmntent("/proc/mounts", "r");
+    FILE* fp = setmntent("/proc/mounts", "re");
     if (fp == NULL) {
         PLOG(ERROR) << "Failed to open /proc/mounts";
         return -errno;