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

Commit fa8900e7 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Automerger Merge Worker
Browse files

Merge "Use the dm target for userdata" into main am: 389c03d4 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2835040



Change-Id: I96ef61177086ee76f8388e1718c0b7d49df550c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc60d3d6 389c03d4

fs_mgr/fs_mgr.cpp

+8 −1
Original line number Diff line number Diff line
@@ -851,7 +851,14 @@ static int __mount(const std::string& source, const std::string& target, const F 
                  << ",type=" << entry.fs_type << ", gc_allowance=" << gc_allowance << "%)=" << ret

                  << "(" << save_errno << ")";

        }

        ret = mount(source.c_str(), target.c_str(), entry.fs_type.c_str(), mountflags,



        // Let's get the raw dm target, if it's a symlink, since some existing applications

        // rely on /proc/mounts to find the userdata's dm target path. Don't break that assumption.

        std::string real_source;

        if (!android::base::Realpath(source, &real_source)) {

            real_source = source;

        }

        ret = mount(real_source.c_str(), target.c_str(), entry.fs_type.c_str(), mountflags,

                    opts.c_str());

        save_errno = errno;

        if (try_f2fs_gc_allowance) gc_allowance += 10;