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 c604ccfa: Merge "Only pass nomblk_io_submit option when mounting ext4" 

* commit 'c604ccfadd9412366709b9b74a283ec966a0cec7':
  Only pass nomblk_io_submit option when mounting ext4
This commit is contained in:
Elliott Hughes 2015-06-11 01:33:40 +00:00 committed by Android Git Automerger
parent 7813481e95 c604ccfadd
commit 450a24a598
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs_mgr/fs_mgr.c
View File

@ -95,7 +95,7 @@ static void check_fs(char *blk_device, char *fs_type, char *target)
int status;
int ret;
long tmpmnt_flags = MS_NOATIME | MS_NOEXEC | MS_NOSUID;
char *tmpmnt_opts = "nomblk_io_submit,errors=remount-ro";
char tmpmnt_opts[64] = "errors=remount-ro";
char *e2fsck_argv[] = {
E2FSCK_BIN,
"-y",
@ -118,6 +118,10 @@ static void check_fs(char *blk_device, char *fs_type, char *target)
* fix the filesystem.
*/
errno = 0;
if (!strcmp(fs_type, "ext4")) {
// This option is only valid with ext4
strlcat(tmpmnt_opts, ",nomblk_io_submit", sizeof(tmpmnt_opts));
}
ret = mount(blk_device, target, fs_type, tmpmnt_flags, tmpmnt_opts);
INFO("%s(): mount(%s,%s,%s)=%d: %s\n",
__func__, blk_device, target, fs_type, ret, strerror(errno));