commit a92bdeb7f55aa578f673e889eff0895a02159a18
author LongPing.WEI <weilongping@huawei.com> Wed Nov 28 09:55:03 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 28 09:55:03 2018 -0800
tree 46959c8a24ba16ae1dc0b9bc4893771727215e65
parent b0b31d360dba3c1e02f8bae31fa3ddad3ea6c639
parent 396040ca2cf6e296c19c74993e7dd61dc2b5570f

Merge "Use setmntent with "e" option"
am: 396040ca2c

Change-Id: I4ccb2a328f1203ab1fc9d5c58d89551f737d58b6

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 04c3956..ce1f777 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -766,7 +766,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 21136cf..59a3d1b 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -589,7 +589,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;