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

Commit fe6fcc4c authored by JP Abgrall's avatar JP Abgrall
Browse files

fs_mgr: recognize a notrim mountpoint flag 

Some partitions don't need trimming.
Needs a vold:fstrim change

Bug: 19624276
Change-Id: I8df715bd18688d7921afa2f3743f7d2a68760699
parent 23247875

fs_mgr/fs_mgr_fstab.c

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ static struct flag_list fs_mgr_flags[] = { 
    { "zramsize=",   MF_ZRAMSIZE },

    { "verify",      MF_VERIFY },

    { "noemulatedsd", MF_NOEMULATEDSD },

    { "notrim",       MF_NOTRIM },

    { "defaults",    0 },

    { 0,             0 },

};
@@ -432,3 +433,8 @@ int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab) 
{

    return fstab->fs_mgr_flags & MF_NOEMULATEDSD;

}



int fs_mgr_is_notrim(struct fstab_rec *fstab)

{

    return fstab->fs_mgr_flags & MF_NOTRIM;

}

fs_mgr/fs_mgr_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#define MF_FORCECRYPT   0x400

#define MF_NOEMULATEDSD 0x800 /* no emulated sdcard daemon, sd card is the only

                                 external storage */

#define MF_NOTRIM       0x1000



#define DM_BUF_SIZE 4096

fs_mgr/include/fs_mgr.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ int fs_mgr_is_nonremovable(struct fstab_rec *fstab); 
int fs_mgr_is_verified(struct fstab_rec *fstab);

int fs_mgr_is_encryptable(struct fstab_rec *fstab);

int fs_mgr_is_noemulatedsd(struct fstab_rec *fstab);

int fs_mgr_is_notrim(struct fstab_rec *fstab);

int fs_mgr_swapon_all(struct fstab *fstab);

#ifdef __cplusplus

}