diff options
author | Tao Bao <tbao@google.com> | 2017-04-18 01:37:55 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-18 01:37:55 +0200 |
commit | 2d356db998754ff87ddd9ccee823d5707816561c (patch) | |
tree | 7b145602016587c7ab2b0fcf8c0189d89e9e576c | |
parent | Fix the double free in verify_package_compatibility(). am: f978278995 (diff) | |
parent | Merge "libmounts: Remove two dead functions." am: 4854e77fd2 am: 7e031fdfe6 (diff) | |
download | android_bootable_recovery-2d356db998754ff87ddd9ccee823d5707816561c.tar android_bootable_recovery-2d356db998754ff87ddd9ccee823d5707816561c.tar.gz android_bootable_recovery-2d356db998754ff87ddd9ccee823d5707816561c.tar.bz2 android_bootable_recovery-2d356db998754ff87ddd9ccee823d5707816561c.tar.lz android_bootable_recovery-2d356db998754ff87ddd9ccee823d5707816561c.tar.xz android_bootable_recovery-2d356db998754ff87ddd9ccee823d5707816561c.tar.zst android_bootable_recovery-2d356db998754ff87ddd9ccee823d5707816561c.zip |
-rw-r--r-- | mounts.cpp | 17 | ||||
-rw-r--r-- | mounts.h | 4 |
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; -} @@ -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 |