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

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

Merge "fs_mgr: report errno string for __mount errors" 

am: 6333cd09

Change-Id: Ic3c85f6ed01d5edd2bfd0a29063610b4d8159f31
parents d74d572f 6333cd09

fs_mgr/fs_mgr.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -476,10 +476,11 @@ static int __mount(const char *source, const char *target, const struct fstab_re 
        if ((info.st_mode & S_IFMT) == S_IFLNK)

        if ((info.st_mode & S_IFMT) == S_IFLNK)

            unlink(target);

            unlink(target);

    mkdir(target, 0755);

    mkdir(target, 0755);

    errno = 0;

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

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

    save_errno = errno;

    save_errno = errno;

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

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

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

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

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

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

        fs_mgr_set_blk_ro(source);

        fs_mgr_set_blk_ro(source);

    }

    }