Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 450a24a5 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am c604ccfa: Merge "Only pass nomblk_io_submit option when mounting ext4" 

* commit 'c604ccfa':
  Only pass nomblk_io_submit option when mounting ext4
parents 7813481e c604ccfa

fs_mgr/fs_mgr.c

+5 −1
Original line number Diff line number Diff line
@@ -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));