PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Log the error message when failing to mount/umount."

Browse Source 
am: 850f89f198

Change-Id: I5de062307d6a395035cada802fd8fe202418407b
This commit is contained in:
Tao Bao
2017-03-29 06:24:41 +00:00
committed by android-build-merger
parent 197e49d60c 850f89f198
commit 23fe20fb6e
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+4 -2
View File
@@ -29,9 +29,11 @@ include $(BUILD_STATIC_LIBRARY)
# =============================== # ===============================
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := mounts.cpp LOCAL_SRC_FILES := mounts.cpp
LOCAL_CLANG := true LOCAL_CFLAGS := \
LOCAL_CFLAGS := -Wall -Wno-unused-parameter -Werror -Wall \
-Werror
LOCAL_MODULE := libmounts LOCAL_MODULE := libmounts
LOCAL_STATIC_LIBRARIES := libbase
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# recovery (static executable) # recovery (static executable)
mounts.cpp
+18 -8
View File
@@ -27,6 +27,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <android-base/logging.h>
struct MountedVolume { struct MountedVolume {
std::string device; std::string device;
std::string mount_point; std::string mount_point;
@@ -75,15 +77,23 @@ MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point) {
} }
int unmount_mounted_volume(MountedVolume* volume) { int unmount_mounted_volume(MountedVolume* volume) {
// Intentionally pass the empty string to umount if the caller tries // Intentionally pass the empty string to umount if the caller tries to unmount a volume they
// to unmount a volume they already unmounted using this // already unmounted using this function.
// function. std::string mount_point = volume->mount_point;
std::string mount_point = volume->mount_point; volume->mount_point.clear();
volume->mount_point.clear(); int result = umount(mount_point.c_str());
return umount(mount_point.c_str()); if (result == -1) {
PLOG(WARNING) << "Failed to umount " << mount_point;
}
return result;
} }
int remount_read_only(MountedVolume* volume) { int remount_read_only(MountedVolume* volume) {
return mount(volume->device.c_str(), volume->mount_point.c_str(), volume->filesystem.c_str(), int result = mount(volume->device.c_str(), volume->mount_point.c_str(),
MS_NOATIME | MS_NODEV | MS_NODIRATIME | MS_RDONLY | MS_REMOUNT, 0); volume->filesystem.c_str(),
MS_NOATIME | MS_NODEV | MS_NODIRATIME | MS_RDONLY | MS_REMOUNT, 0);
if (result == -1) {
PLOG(WARNING) << "Failed to remount read-only " << volume->mount_point;
}
return result;
} }