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

Commit 6b78fad1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am a9396549: Fix my incorrect merge resolution for 132b7d75 harder. 

* commit 'a9396549':
  Fix my incorrect merge resolution for 132b7d75 harder.
parents 43564031 a9396549

fs_mgr/fs_mgr_priv.h

+0 −10
Original line number Diff line number Diff line
@@ -25,16 +25,6 @@ 


#define CRYPTO_TMPFS_OPTIONS "size=128m,mode=0771,uid=1000,gid=1000"



struct fstab_rec {

    char *blk_dev;

    char *mnt_point;

    char *type;

    unsigned long flags;

    char *fs_options;

    int fs_mgr_flags;

    char *key_loc;

};



#define WAIT_TIMEOUT 20



/* fstab has the following format: