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

Commit edbfb50d authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_mgr: __mount better detail for ENOENT" 

am: cf207d08

Change-Id: I1dfda09a2df60c9b785543639dee5721d1568865
parents 746b2332 cf207d08

fs_mgr/fs_mgr.cpp

+12 −2
Original line number Diff line number Diff line
@@ -529,8 +529,18 @@ static int __mount(const char *source, const char *target, const struct fstab_re 
    errno = 0;

    ret = mount(source, target, rec->fs_type, mountflags, rec->fs_options);

    save_errno = errno;

    PINFO << __FUNCTION__ << "(source=" << source << ",target=" << target

          << ",type=" << rec->fs_type << ")=" << ret;

    const char* target_missing = "";

    const char* source_missing = "";

    if (save_errno == ENOENT) {

        if (access(target, F_OK)) {

            target_missing = "(missing)";

        } else if (access(source, F_OK)) {

            source_missing = "(missing)";

        }

        errno = save_errno;

    }

    PINFO << __FUNCTION__ << "(source=" << source << source_missing << ",target=" << target

          << target_missing << ",type=" << rec->fs_type << ")=" << ret;

    if ((ret == 0) && (mountflags & MS_RDONLY) != 0) {

        fs_mgr_set_blk_ro(source);

    }