am 41836711: Merge "Sleep to wait for dm to create node" into jb-dev

* commit '418367112c96f6ce45aa142d613a575046b7f65f':
  Sleep to wait for dm to create node
This commit is contained in:
Kenny Root 2012-05-10 23:32:27 -07:00 committed by Android Git Automerger
commit 760cec444b

View file

@ -948,6 +948,19 @@ int VolumeManager::mountAsec(const char *id, const char *key, int ownerUid) {
}
}
/*
* The device mapper node needs to be created. Sometimes it takes a
* while. Wait for up to 1 second. We could also inspect incoming uevents,
* but that would take more effort.
*/
int tries = 25;
while (tries--) {
if (!access(dmDevice, F_OK) || errno != ENOENT) {
break;
}
usleep(40 * 1000);
}
int result;
if (sb.c_opts & ASEC_SB_C_OPTS_EXT4) {
result = Ext4::doMount(dmDevice, mountPoint, true, false, true);