ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: Add support for MS_LAZYTIME." into main am: 33a742028e

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

Change-Id: I806ec7dd0d5454b050f730c61d66fdce21bf47d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-09-05 19:46:50 +00:00 • committed by Automerger Merge Worker
commit 473aa1de75
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/libfstab/fstab.cpp
View file

@ -39,6 +39,10 @@
#include "fstab_priv.h"
#include "logging_macros.h"
#if !defined(MS_LAZYTIME)
#define MS_LAZYTIME (1 << 25)
#endif
using android::base::EndsWith;
using android::base::ParseByteCount;
using android::base::ParseInt;
@ -74,6 +78,7 @@ FlagList kMountFlagsList[] = {
{"private", MS_PRIVATE},
{"slave", MS_SLAVE},
{"shared", MS_SHARED},
{"lazytime", MS_LAZYTIME},
{"defaults", 0},
};

5
fs_mgr/tests/fs_mgr_test.cpp
View file

@ -37,6 +37,10 @@
using namespace android::fs_mgr;
using namespace testing;
#if !defined(MS_LAZYTIME)
#define MS_LAZYTIME (1 << 25)
#endif
namespace {
const std::string cmdline =
@ -329,6 +333,7 @@ TEST(fs_mgr, fs_mgr_read_fstab_file_proc_mounts) {
{"private", MS_PRIVATE},
{"slave", MS_SLAVE},
{"shared", MS_SHARED},
{"lazytime", MS_LAZYTIME},
{"defaults", 0},
{0, 0},
};