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

Commit 539c4373 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "fs_mgr: fix typo from off64_t change." am: 7f5a2d3c 

am: 573f03a2

Change-Id: Ib66d6c2cc41f2f5f24c83c638114df0df5d97275
parents 54155712 573f03a2

fs_mgr/fs_mgr_fstab.cpp

+6 −9
Original line number Diff line number Diff line
@@ -49,15 +49,15 @@ struct fs_mgr_flag_values { 
    int max_comp_streams;

    off64_t zram_size;

    off64_t reserved_size;

    unsigned int file_contents_mode;

    unsigned int file_names_mode;

    int file_contents_mode;

    int file_names_mode;

    off64_t erase_blk_size;

    off64_t logical_blk_size;

};



struct flag_list {

    const char *name;

    unsigned int flag;

    int flag;

};



static struct flag_list mount_flags[] = {
@@ -133,9 +133,8 @@ static const struct flag_list file_names_encryption_modes[] = { 
    {0, 0},

};



static unsigned int encryption_mode_to_flag(const struct flag_list *list,

                                            const char *mode, const char *type)

{

static int encryption_mode_to_flag(const struct flag_list* list, const char* mode,

                                   const char* type) {

    const struct flag_list *j;



    for (j = list; j->name; ++j) {
@@ -147,9 +146,7 @@ static unsigned int encryption_mode_to_flag(const struct flag_list *list, 
    return 0;

}



static const char *flag_to_encryption_mode(const struct flag_list *list,

                                           unsigned int flag)

{

static const char* flag_to_encryption_mode(const struct flag_list* list, int flag) {

    const struct flag_list *j;



    for (j = list; j->name; ++j) {

fs_mgr/include_fstab/fstab/fstab.h

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ struct fstab_rec { 
    int max_comp_streams;

    off64_t zram_size;

    off64_t reserved_size;

    off64_t file_contents_mode;

    off64_t file_names_mode;

    int file_contents_mode;

    int file_names_mode;

    off64_t erase_blk_size;

    off64_t logical_blk_size;

    char* sysfs_path;