commit 786b1232d201d46f59bd9da84bfcfcb9ad80bb6c
author Elliott Hughes <enh@google.com> Thu Jul 11 18:48:30 2013 -0700
committer Elliott Hughes <enh@google.com> Thu Jul 11 18:48:30 2013 -0700
tree 400e20a41d13d70dd5e6251a318b08fe17ce041f
parent 149a9b68ab09e4934556e9247ee5f98008a65662
parent 42031e0ed7c1149c6ff3d2f2dc0ef64ff3573fe6

resolved conflicts for merge of 42031e0e to stage-aosp-master

Change-Id: I3e6337c258b3e7fb6eee4ed8e3664a69ae219fd6

fs_mgr/fs_mgr_priv.h

diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h
index 75dad49..d35af25 100644
--- a/fs_mgr/fs_mgr_priv.h
+++ b/fs_mgr/fs_mgr_priv.h
@@ -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: