am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev

* commit '7fd51b36dabedee4de159213237e71ba20865812':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices
This commit is contained in:
Ken Sumrall 2012-11-12 11:50:22 -08:00 committed by Android Git Automerger
commit 1626b98c5b
1 changed files with 2 additions and 2 deletions

View File

@ -523,11 +523,11 @@ int fs_mgr_do_mount(char *fstab_file, char *n_name, char *n_blk_dev, char *tmp_m
/* We found our match */
/* First check the filesystem if requested */
if (fstab[i].fs_mgr_flags & MF_WAIT) {
wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT);
wait_for_file(n_blk_dev, WAIT_TIMEOUT);
}
if (fstab[i].fs_mgr_flags & MF_CHECK) {
check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point);
check_fs(n_blk_dev, fstab[i].type, fstab[i].mnt_point);
}
/* Now mount it where requested */