summaryrefslogtreecommitdiffstats
path: root/mounts.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-03-29 08:31:42 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-03-29 08:31:42 +0200
commit563340d9ffe91ae060ecc583faa36aa474a28f05 (patch)
treececf0cdefbc598be45473322946ada10e1457477 /mounts.cpp
parentFix the bad merge (duplicate tests). (diff)
parentMerge "Log the error message when failing to mount/umount." am: 850f89f198 am: 23fe20fb6e (diff)
downloadandroid_bootable_recovery-563340d9ffe91ae060ecc583faa36aa474a28f05.tar
android_bootable_recovery-563340d9ffe91ae060ecc583faa36aa474a28f05.tar.gz
android_bootable_recovery-563340d9ffe91ae060ecc583faa36aa474a28f05.tar.bz2
android_bootable_recovery-563340d9ffe91ae060ecc583faa36aa474a28f05.tar.lz
android_bootable_recovery-563340d9ffe91ae060ecc583faa36aa474a28f05.tar.xz
android_bootable_recovery-563340d9ffe91ae060ecc583faa36aa474a28f05.tar.zst
android_bootable_recovery-563340d9ffe91ae060ecc583faa36aa474a28f05.zip
Diffstat (limited to 'mounts.cpp')
-rw-r--r--mounts.cpp26
1 files changed, 18 insertions, 8 deletions
diff --git a/mounts.cpp b/mounts.cpp
index f23376b06..fbcbac014 100644
--- a/mounts.cpp
+++ b/mounts.cpp
@@ -27,6 +27,8 @@
#include <string>
#include <vector>
+#include <android-base/logging.h>
+
struct MountedVolume {
std::string device;
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) {
- // Intentionally pass the empty string to umount if the caller tries
- // to unmount a volume they already unmounted using this
- // function.
- std::string mount_point = volume->mount_point;
- volume->mount_point.clear();
- return umount(mount_point.c_str());
+ // Intentionally pass the empty string to umount if the caller tries to unmount a volume they
+ // already unmounted using this function.
+ std::string mount_point = volume->mount_point;
+ volume->mount_point.clear();
+ int result = umount(mount_point.c_str());
+ if (result == -1) {
+ PLOG(WARNING) << "Failed to umount " << mount_point;
+ }
+ return result;
}
int remount_read_only(MountedVolume* volume) {
- return mount(volume->device.c_str(), volume->mount_point.c_str(), volume->filesystem.c_str(),
- MS_NOATIME | MS_NODEV | MS_NODIRATIME | MS_RDONLY | MS_REMOUNT, 0);
+ int result = mount(volume->device.c_str(), volume->mount_point.c_str(),
+ 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;
}