diff options
| author | Sandeep Patil <sspatil@google.com> | 2017-02-23 07:23:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-23 07:23:37 +0000 |
| commit | bb5a8380b0e35d3b7ac45ccf326fed130f0beb89 (patch) | |
| tree | 09afe975e49465ae154261d926933dfc6f273f57 /fs_mgr/include | |
| parent | 6624cdb2b165c9743b3f719f1be8a6a4f6e2f625 (diff) | |
| parent | 5f08cb2aeafa2d1b8035d7e5ec84bfe83d4faece (diff) | |
| download | core-bb5a8380b0e35d3b7ac45ccf326fed130f0beb89.tar.gz core-bb5a8380b0e35d3b7ac45ccf326fed130f0beb89.tar.bz2 core-bb5a8380b0e35d3b7ac45ccf326fed130f0beb89.zip | |
Merge changes from topic 'early-mount-support' am: 4bd3facbb1 am: e0d7b830f0
am: 5f08cb2aea
Change-Id: I40a70549a545d9d1dd4f007f5fd259102785412c
Diffstat (limited to 'fs_mgr/include')
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index 597651448..7498521b9 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -104,6 +104,7 @@ int fs_mgr_mount_all(struct fstab *fstab, int mount_mode); int fs_mgr_do_mount(struct fstab *fstab, const char *n_name, char *n_blk_device, char *tmp_mount_point); +int fs_mgr_do_mount_one(struct fstab_rec *rec); int fs_mgr_do_tmpfs_mount(char *n_name); int fs_mgr_unmount_all(struct fstab *fstab); int fs_mgr_get_crypt_info(struct fstab *fstab, char *key_loc, @@ -117,6 +118,7 @@ struct fstab_rec *fs_mgr_get_entry_for_mount_point(struct fstab *fstab, const ch int fs_mgr_is_voldmanaged(const struct fstab_rec *fstab); int fs_mgr_is_nonremovable(const struct fstab_rec *fstab); int fs_mgr_is_verified(const struct fstab_rec *fstab); +int fs_mgr_is_verifyatboot(const struct fstab_rec *fstab); int fs_mgr_is_encryptable(const struct fstab_rec *fstab); int fs_mgr_is_file_encrypted(const struct fstab_rec *fstab); void fs_mgr_get_file_encryption_modes(const struct fstab_rec *fstab, @@ -134,10 +136,10 @@ int fs_mgr_swapon_all(struct fstab *fstab); int fs_mgr_do_format(struct fstab_rec *fstab, bool reserve_footer); -#define FS_MGR_EARLY_SETUP_VERITY_NO_VERITY -2 -#define FS_MGR_EARLY_SETUP_VERITY_FAIL -1 -#define FS_MGR_EARLY_SETUP_VERITY_SUCCESS 0 -int fs_mgr_early_setup_verity(struct fstab_rec *fstab); +#define FS_MGR_SETUP_VERITY_DISABLED (-2) +#define FS_MGR_SETUP_VERITY_FAIL (-1) +#define FS_MGR_SETUP_VERITY_SUCCESS 0 +int fs_mgr_setup_verity(struct fstab_rec *fstab, bool wait_for_verity_dev); #ifdef __cplusplus } |