ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mount/unmount filesystems before running e2fsck

Browse source 
This works around a performance problem in the firmware of
some emmc chips.

Change-Id: Ia414b4604d11e47ce9cb3f86ac82602e081bb09e
This commit is contained in:
Ken Sumrall 2012-07-23 19:34:00 -07:00
parent 55b763ff7b
commit 5dc5bfefa0
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
fs_mgr/fs_mgr.c
View file

@ -358,13 +358,34 @@ static void free_fstab(struct fstab_rec *fstab)
free(fstab); free(fstab);
} }
static void check_fs(char *blk_dev, char *type) static void check_fs(char *blk_dev, char *type, char *target)
{ {
pid_t pid; pid_t pid;
int status; int status;
int ret;
long tmpmnt_flags = MS_NOATIME | MS_NOEXEC | MS_NOSUID;
char *tmpmnt_opts = "nomblk_io_submit,errors=remount-ro";
/* Check for the types of filesystems we know how to check */ /* Check for the types of filesystems we know how to check */
if (!strcmp(type, "ext2") || !strcmp(type, "ext3") || !strcmp(type, "ext4")) { if (!strcmp(type, "ext2") || !strcmp(type, "ext3") || !strcmp(type, "ext4")) {
/*
* First try to mount and unmount the filesystem. We do this because
* the kernel is more efficient than e2fsck in running the journal and
* processing orphaned inodes, and on at least one device with a
* performance issue in the emmc firmware, it can take e2fsck 2.5 minutes
* to do what the kernel does in about a second.
*
* After mounting and unmounting the filesystem, run e2fsck, and if an
* error is recorded in the filesystem superblock, e2fsck will do a full
* check. Otherwise, it does nothing. If the kernel cannot mount the
* filesytsem due to an error, e2fsck is still run to do a full check
* fix the filesystem.
*/
ret = mount(blk_dev, target, type, tmpmnt_flags, tmpmnt_opts);
if (! ret) {
umount(target);
}
INFO("Running %s on %s\n", E2FSCK_BIN, blk_dev); INFO("Running %s on %s\n", E2FSCK_BIN, blk_dev);
pid = fork(); pid = fork();
if (pid > 0) { if (pid > 0) {
@ -434,7 +455,7 @@ int fs_mgr_mount_all(char *fstab_file)
} }
if (fstab[i].fs_mgr_flags & MF_CHECK) { if (fstab[i].fs_mgr_flags & MF_CHECK) {
check_fs(fstab[i].blk_dev, fstab[i].type); check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point);
} }
mret = mount(fstab[i].blk_dev, fstab[i].mnt_point, fstab[i].type, mret = mount(fstab[i].blk_dev, fstab[i].mnt_point, fstab[i].type,
@ -500,7 +521,7 @@ int fs_mgr_do_mount(char *fstab_file, char *n_name, char *n_blk_dev, char *tmp_m
} }
if (fstab[i].fs_mgr_flags & MF_CHECK) { if (fstab[i].fs_mgr_flags & MF_CHECK) {
check_fs(fstab[i].blk_dev, fstab[i].type); check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point);
} }
/* Now mount it where requested */ /* Now mount it where requested */