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

am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors" 

* commit 'bdea585e68a054552a26272ec9321afaad9ac915':
  fs_mgr: increase verboseness on mount errors
This commit is contained in:
Nick Kralevich 2014-01-16 19:23:05 +00:00 committed by Android Git Automerger
parent 11190d0ccb bdea585e68
commit 325a99fb63
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs_mgr/fs_mgr.c
View File

@ -517,6 +517,7 @@ int fs_mgr_mount_all(struct fstab *fstab)
int encrypted = 0;
int ret = -1;
int mret;
int mount_errno;
if (!fstab) {
return ret;
@ -560,6 +561,9 @@ int fs_mgr_mount_all(struct fstab *fstab)
continue;
}
/* back up errno as partition_wipe clobbers the value */
mount_errno = errno;
/* mount(2) returned an error, check if it's encrypted and deal with it */
if ((fstab->recs[i].fs_mgr_flags & MF_CRYPT) &&
!partition_wiped(fstab->recs[i].blk_device)) {
@ -568,14 +572,16 @@ int fs_mgr_mount_all(struct fstab *fstab)
*/
if (mount("tmpfs", fstab->recs[i].mount_point, "tmpfs",
MS_NOATIME | MS_NOSUID | MS_NODEV, CRYPTO_TMPFS_OPTIONS) < 0) {
ERROR("Cannot mount tmpfs filesystem for encrypted fs at %s\n",
fstab->recs[i].mount_point);
ERROR("Cannot mount tmpfs filesystem for encrypted fs at %s error: %s\n",
fstab->recs[i].mount_point, strerror(errno));
goto out;
}
encrypted = 1;
} else {
ERROR("Cannot mount filesystem on %s at %s\n",
fstab->recs[i].blk_device, fstab->recs[i].mount_point);
ERROR("Failed to mount an un-encryptable or wiped partition on"
"%s at %s options: %s error: %s\n",
fstab->recs[i].blk_device, fstab->recs[i].mount_point,
fstab->recs[i].fs_options, strerror(mount_errno));
goto out;
}
}
@ -644,8 +650,8 @@ int fs_mgr_do_mount(struct fstab *fstab, char *n_name, char *n_blk_device,
}
if (__mount(n_blk_device, m, fstab->recs[i].fs_type,
fstab->recs[i].flags, fstab->recs[i].fs_options)) {
ERROR("Cannot mount filesystem on %s at %s\n",
n_blk_device, m);
ERROR("Cannot mount filesystem on %s at %s options: %s error: %s\n",
n_blk_device, m, fstab->recs[i].fs_options, strerror(errno));
goto out;
} else {
ret = 0;