Merge "libmounts: Remove two dead functions."
am: 4854e77fd2
Change-Id: Iac3ba66cea9a551141ba7c2c97b8eae14b9ec881
This commit is contained in:
17
mounts.cpp
17
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;
|
||||
}
|
||||
|
||||
4
mounts.h
4
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
|
||||
|
||||
Reference in New Issue
Block a user