openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adb: Fix `adb remount`"

This commit is contained in:
Treehugger Robot 2018-07-23 18:19:56 +00:00 committed by Gerrit Code Review
parent 1d2b29a902 46b55e83c5
commit a54c293822
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adb/daemon/remount_service.cpp
View File

@ -178,10 +178,6 @@ static bool remount_partition(int fd, const char* dir) {
}
unsigned long remount_flags = get_mount_flags(fd, dir);
if ((remount_flags & MS_RDONLY) == 0) {
// Mount is already writable.
return true;
}
remount_flags &= ~MS_RDONLY;
remount_flags |= MS_REMOUNT;
@ -192,7 +188,7 @@ static bool remount_partition(int fd, const char* dir) {
WriteFdFmt(fd, "remount of the %s mount failed: %s.\n", dir, strerror(errno));
return false;
}
if (mount(dev.c_str(), dir, "none", remount_flags, nullptr) == -1) {
if (mount(dev.c_str(), dir, "none", MS_REMOUNT, nullptr) == -1) {
WriteFdFmt(fd, "remount of the %s superblock failed: %s\n", dir, strerror(errno));
return false;
}