tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "cryptfs: log beginning/end of each unmount attempt" am: e33bd41f49

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1735012

Change-Id: Id6caea9e59a5b65a594c3545ca8d3e90a0558a7c
This commit is contained in:
Eric Biggers 2021-06-14 22:15:18 +00:00 committed by Automerger Merge Worker
commit d535dc6846
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cryptfs.cpp
View file

@ -1525,6 +1525,7 @@ static int wait_and_unmount(const char* mountpoint) {
// Subdirectory mount will cause a failure of umount.
ensure_subdirectory_unmounted(mountpoint);
SLOGD("unmounting mount %s\n", mountpoint);
if (umount(mountpoint) == 0) {
break;
}
@ -1533,10 +1534,12 @@ static int wait_and_unmount(const char* mountpoint) {
/* EINVAL is returned if the directory is not a mountpoint,
* i.e. there is no filesystem mounted there. So just get out.
*/
SLOGD("%s is not a mountpoint, nothing to do\n", mountpoint);
break;
}
err = errno;
SLOGW("unmounting mount %s failed: %s\n", mountpoint, strerror(err));
// If it's taking too long, kill the processes with open files.
//
@ -1560,8 +1563,8 @@ static int wait_and_unmount(const char* mountpoint) {
SLOGD("unmounting %s succeeded\n", mountpoint);
rc = 0;
} else {
SLOGE("too many retries -- giving up unmounting %s\n", mountpoint);
android::vold::KillProcessesWithOpenFiles(mountpoint, 0);
SLOGE("unmounting %s failed: %s\n", mountpoint, strerror(err));
rc = -1;
}