openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix my incorrect merge resolution for 132b7d750e harder. 

Change-Id: I3f8bc955f035b49407540053462e53b3f262d381
This commit is contained in:
Elliott Hughes 2013-07-11 19:07:06 -07:00
parent 7b9c33b1e0
commit a9396549b3
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs_mgr/fs_mgr_priv.h
View File

@ -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: