Merge "fs_mgr: Add support for MS_LAZYTIME." into main
This commit is contained in:
commit
33a742028e
2 changed files with 10 additions and 0 deletions
|
|
@ -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},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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},
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue