am dccd7773: am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master

* commit 'dccd77730754b681f3517308359a34f86aecd99f':
  fs_mgr_priv: Extend fs wait timeout to 20 seconds
This commit is contained in:
Elliott Hughes 2013-07-11 18:52:12 -07:00 committed by Android Git Automerger
commit ad989d038e
1 changed files with 10 additions and 0 deletions

View File

@ -25,6 +25,16 @@
#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 5
/* fstab has the following format: