diff options
| author | Ed Tam <etam@google.com> | 2015-04-13 16:29:05 -0700 |
|---|---|---|
| committer | Ed Tam <etam@google.com> | 2015-04-13 16:29:05 -0700 |
| commit | 438443e742d9cfb91c1193144a3b41744ffad34b (patch) | |
| tree | 2e7c3c910aebf933d713d047218fc46c5296e269 /fs_mgr/fs_mgr_fstab.c | |
| parent | 51c6ad178e723a4cd59a143dd48d81ccdce2d489 (diff) | |
| parent | 79f338465213885900cea5a39f3aeeea083bbe51 (diff) | |
| download | system_core-438443e742d9cfb91c1193144a3b41744ffad34b.tar.gz system_core-438443e742d9cfb91c1193144a3b41744ffad34b.tar.bz2 system_core-438443e742d9cfb91c1193144a3b41744ffad34b.zip | |
resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp
Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280
Diffstat (limited to 'fs_mgr/fs_mgr_fstab.c')
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c index 8b0f7142a..4e0ba4d30 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); +} |