diff options
author | Tom Cherry <tomcherry@google.com> | 2017-07-14 23:22:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-14 23:22:26 +0000 |
commit | a222129aff6706952ba8dc9c06477b3b4d3a734d (patch) | |
tree | 43288fc270ae3d390cabbc6918745e8f4233c9e8 /fs_mgr/fs_mgr_fstab.cpp | |
parent | d16eebd96dda483dd772859e5bc49409c4637486 (diff) | |
parent | e1442a5df03c71d3f04f64304803f20376e83557 (diff) | |
download | system_core-a222129aff6706952ba8dc9c06477b3b4d3a734d.tar.gz system_core-a222129aff6706952ba8dc9c06477b3b4d3a734d.tar.bz2 system_core-a222129aff6706952ba8dc9c06477b3b4d3a734d.zip |
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2 am: 5a6226929e am: d165de95da
am: e1442a5df0
Change-Id: I470057eb4ccc0536eed869114cb999daf36469dc
Diffstat (limited to 'fs_mgr/fs_mgr_fstab.cpp')
-rw-r--r-- | fs_mgr/fs_mgr_fstab.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp index 6c527c573..6dcbded49 100644 --- a/fs_mgr/fs_mgr_fstab.cpp +++ b/fs_mgr/fs_mgr_fstab.cpp @@ -864,32 +864,26 @@ int fs_mgr_is_noemulatedsd(const struct fstab_rec *fstab) return fstab->fs_mgr_flags & MF_NOEMULATEDSD; } -int fs_mgr_is_notrim(struct fstab_rec *fstab) -{ +int fs_mgr_is_notrim(const struct fstab_rec* fstab) { return fstab->fs_mgr_flags & MF_NOTRIM; } -int fs_mgr_is_formattable(struct fstab_rec *fstab) -{ +int fs_mgr_is_formattable(const struct fstab_rec* fstab) { return fstab->fs_mgr_flags & (MF_FORMATTABLE); } -int fs_mgr_is_slotselect(struct fstab_rec *fstab) -{ +int fs_mgr_is_slotselect(const struct fstab_rec* fstab) { return fstab->fs_mgr_flags & MF_SLOTSELECT; } -int fs_mgr_is_nofail(struct fstab_rec *fstab) -{ +int fs_mgr_is_nofail(const struct fstab_rec* fstab) { return fstab->fs_mgr_flags & MF_NOFAIL; } -int fs_mgr_is_latemount(struct fstab_rec *fstab) -{ +int fs_mgr_is_latemount(const struct fstab_rec* fstab) { return fstab->fs_mgr_flags & MF_LATEMOUNT; } -int fs_mgr_is_quota(struct fstab_rec *fstab) -{ +int fs_mgr_is_quota(const struct fstab_rec* fstab) { return fstab->fs_mgr_flags & MF_QUOTA; } |