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

Commit c953d6eb authored by Eric Biggers's avatar Eric Biggers
Browse files

fs_mgr: remove FDE fields from FstabEntry 

Remove the now-unused FDE fields from struct FstabEntry.

Bug: 191796797
Change-Id: Iab11a1fe86ac9d06beef68dc7e3c543f48ce0ac6
parent 63fb1953

fs_mgr/include_fstab/fstab/fstab.h

+2 −7
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct FstabEntry { 
    unsigned long flags = 0;

    std::string fs_options;

    std::string fs_checkpoint_opts;

    std::string key_loc;

    std::string metadata_key_dir;

    std::string metadata_encryption;

    off64_t length = 0;
@@ -60,19 +59,17 @@ struct FstabEntry { 
    struct FsMgrFlags {

        bool wait : 1;

        bool check : 1;

        bool crypt : 1;

        bool crypt : 1;  // Now only used to identify adoptable storage volumes

        bool nonremovable : 1;

        bool vold_managed : 1;

        bool recovery_only : 1;

        bool verify : 1;

        bool force_crypt : 1;

        bool no_emulated_sd : 1;  // No emulated sdcard daemon; sd card is the only external

                                  // storage.

        bool no_trim : 1;

        bool file_encryption : 1;

        bool formattable : 1;

        bool slot_select : 1;

        bool force_fde_or_fbe : 1;

        bool late_mount : 1;

        bool no_fail : 1;

        bool verify_at_boot : 1;
@@ -89,9 +86,7 @@ struct FstabEntry { 
        bool overlayfs_remove_missing_lowerdir : 1;

    } fs_mgr_flags = {};



    bool is_encryptable() const {

        return fs_mgr_flags.crypt || fs_mgr_flags.force_crypt || fs_mgr_flags.force_fde_or_fbe;

    }

    bool is_encryptable() const { return fs_mgr_flags.crypt; }

};



// An Fstab is a collection of FstabEntry structs.

fs_mgr/tests/fs_mgr_test.cpp

+0 −4
Original line number Diff line number Diff line
@@ -193,13 +193,11 @@ bool CompareFlags(FstabEntry::FsMgrFlags& lhs, FstabEntry::FsMgrFlags& rhs) { 
           lhs.vold_managed == rhs.vold_managed &&

           lhs.recovery_only == rhs.recovery_only &&

           lhs.verify == rhs.verify &&

           lhs.force_crypt == rhs.force_crypt &&

           lhs.no_emulated_sd == rhs.no_emulated_sd &&

           lhs.no_trim == rhs.no_trim &&

           lhs.file_encryption == rhs.file_encryption &&

           lhs.formattable == rhs.formattable &&

           lhs.slot_select == rhs.slot_select &&

           lhs.force_fde_or_fbe == rhs.force_fde_or_fbe &&

           lhs.late_mount == rhs.late_mount &&

           lhs.no_fail == rhs.no_fail &&

           lhs.verify_at_boot == rhs.verify_at_boot &&
@@ -505,7 +503,6 @@ source none1 swap defaults fileencryption=,keydirectory=,length=,sw 
        FstabEntry::FsMgrFlags flags = {};

        EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags));

    }

    EXPECT_EQ("", entry->key_loc);

    EXPECT_EQ("", entry->metadata_key_dir);

    EXPECT_EQ(0, entry->length);

    EXPECT_EQ("", entry->label);
@@ -528,7 +525,6 @@ source none1 swap defaults fileencryption=,keydirectory=,length=,sw 
        flags.avb = true;

        EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags));

    }

    EXPECT_EQ("", entry->key_loc);

    EXPECT_EQ("", entry->metadata_key_dir);

    EXPECT_EQ(0, entry->length);

    EXPECT_EQ("", entry->label);