summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-04-18 01:18:54 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-04-18 01:18:54 +0200
commit7e031fdfe6c4f7373ada7dabf7f2e424425cebf4 (patch)
tree4118943f72014f5a3c45151e46e893ef63d4bf91
parentMerge "minadbd: switch adb_thread_create to std::thread." (diff)
parentMerge "libmounts: Remove two dead functions." (diff)
downloadandroid_bootable_recovery-7e031fdfe6c4f7373ada7dabf7f2e424425cebf4.tar
android_bootable_recovery-7e031fdfe6c4f7373ada7dabf7f2e424425cebf4.tar.gz
android_bootable_recovery-7e031fdfe6c4f7373ada7dabf7f2e424425cebf4.tar.bz2
android_bootable_recovery-7e031fdfe6c4f7373ada7dabf7f2e424425cebf4.tar.lz
android_bootable_recovery-7e031fdfe6c4f7373ada7dabf7f2e424425cebf4.tar.xz
android_bootable_recovery-7e031fdfe6c4f7373ada7dabf7f2e424425cebf4.tar.zst
android_bootable_recovery-7e031fdfe6c4f7373ada7dabf7f2e424425cebf4.zip
-rw-r--r--mounts.cpp17
-rw-r--r--mounts.h4
2 files changed, 0 insertions, 21 deletions
diff --git a/mounts.cpp b/mounts.cpp
index fbcbac014..76fa65739 100644
--- a/mounts.cpp
+++ b/mounts.cpp
@@ -62,13 +62,6 @@ bool scan_mounted_volumes() {
return true;
}
-MountedVolume* find_mounted_volume_by_device(const char* device) {
- for (size_t i = 0; i < g_mounts_state.size(); ++i) {
- if (g_mounts_state[i]->device == device) return g_mounts_state[i];
- }
- return nullptr;
-}
-
MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point) {
for (size_t i = 0; i < g_mounts_state.size(); ++i) {
if (g_mounts_state[i]->mount_point == mount_point) return g_mounts_state[i];
@@ -87,13 +80,3 @@ int unmount_mounted_volume(MountedVolume* volume) {
}
return result;
}
-
-int remount_read_only(MountedVolume* volume) {
- 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;
-}
diff --git a/mounts.h b/mounts.h
index 1b7670329..0de1ebd0a 100644
--- a/mounts.h
+++ b/mounts.h
@@ -21,12 +21,8 @@ struct MountedVolume;
bool scan_mounted_volumes();
-MountedVolume* find_mounted_volume_by_device(const char* device);
-
MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point);
int unmount_mounted_volume(MountedVolume* volume);
-int remount_read_only(MountedVolume* volume);
-
#endif