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

Commit aeeadf43 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Make some fstab functions available outside of fs_mgr" into main am: 6e1b4c5a 

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



Change-Id: I37940d837a59a413930fbd5a7924dd84518b76f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62509ec1 6e1b4c5a

fs_mgr/include/fs_mgr/roots.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ namespace fs_mgr { 
// first match or nullptr.

FstabEntry* GetEntryForPath(Fstab* fstab, const std::string& path);



std::vector<FstabEntry*> GetEntriesForPath(Fstab* fstab, const std::string& path);



// Make sure that the volume 'path' is on is mounted.

// * If 'mount_point' is nullptr, use mount point in fstab. Caller can call

//   fs_mgr_ensure_path_unmounted() with the same 'path' argument to unmount.