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

am: a92bdeb7f5

Change-Id: I269ba8a35f5441e78c6d7945ce4726eae3e33cdd

Utils.cpp

@@ -766,7 +766,7 @@ bool IsRunningInEmulator() {
 }
 
 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

@@ -589,7 +589,7 @@ int VolumeManager::unmountAll() {
 
     // 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;