summaryrefslogtreecommitdiffstats
path: root/fs_mgr/fs_mgr_fstab.c
diff options
context:
space:
mode:
authorEd Tam <etam@google.com>2015-04-13 23:37:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-13 23:37:52 +0000
commitd0b6de41f8b36df751962e28803db7a4375751ff (patch)
treeb1350343701dccd609de5b167199748145395b21 /fs_mgr/fs_mgr_fstab.c
parent17b6a39f04c291c6002a22ec60eecdea51f86170 (diff)
parent438443e742d9cfb91c1193144a3b41744ffad34b (diff)
downloadsystem_core-d0b6de41f8b36df751962e28803db7a4375751ff.zip
system_core-d0b6de41f8b36df751962e28803db7a4375751ff.tar.gz
system_core-d0b6de41f8b36df751962e28803db7a4375751ff.tar.bz2
Merge "resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Diffstat (limited to 'fs_mgr/fs_mgr_fstab.c')
-rw-r--r--fs_mgr/fs_mgr_fstab.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c
index 8b0f714..4e0ba4d 100644
--- a/fs_mgr/fs_mgr_fstab.c
+++ b/fs_mgr/fs_mgr_fstab.c
@@ -70,6 +70,7 @@ static struct flag_list fs_mgr_flags[] = {
{ "zramsize=", MF_ZRAMSIZE },
{ "verify", MF_VERIFY },
{ "noemulatedsd", MF_NOEMULATEDSD },
+ { "formattable", MF_FORMATTABLE },
{ "defaults", 0 },
{ 0, 0 },
};
@@ -448,3 +449,8 @@ int fs_mgr_is_noemulatedsd(const struct fstab_rec *fstab)
{
return fstab->fs_mgr_flags & MF_NOEMULATEDSD;
}
+
+int fs_mgr_is_formattable(struct fstab_rec *fstab)
+{
+ return fstab->fs_mgr_flags & (MF_FORMATTABLE);
+}