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

Commit 3217fa21 authored by David Anderson's avatar David Anderson
Browse files

fs_mgr: Add support for MS_LAZYTIME. 

"lazytime" as a mount option was removed recently in favor of
MS_LAZYTIME.  This is causing mount failures when calling
IVold::commitChanges.

Bug: 329657783
Test: cuttlefish on android-mainline
Change-Id: Id01c1e5bbd0c82e07126be65f638e16600c058e3
parent 9da55b8c

fs_mgr/libfstab/fstab.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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},

};

fs_mgr/tests/fs_mgr_test.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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},

        };