openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs_mgr: fix typo from off64_t change. 

I accidentally changed some _mode enums from unsigned int to off64_t
along with the rest changes.  They probably shouldn't have been
unsigned anyway though, so let's make them plain 'int' while we fix
the original typo.

Test: boot
Change-Id: I0c6c51a1a8170056b99087d249539eb79026cffe
This commit is contained in:
Tom Cherry 2018-11-30 11:25:28 -08:00
parent 9d24734b5c
commit 2c25796aa0
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs_mgr/fs_mgr_fstab.cpp
View File

@ -49,15 +49,15 @@ struct fs_mgr_flag_values {
int max_comp_streams;
off64_t zram_size;
off64_t reserved_size;
unsigned int file_contents_mode;
unsigned int file_names_mode;
int file_contents_mode;
int file_names_mode;
off64_t erase_blk_size;
off64_t logical_blk_size;
};
struct flag_list {
const char *name;
unsigned int flag;
int flag;
};
static struct flag_list mount_flags[] = {
@ -133,9 +133,8 @@ static const struct flag_list file_names_encryption_modes[] = {
{0, 0},
};
static unsigned int encryption_mode_to_flag(const struct flag_list *list,
const char *mode, const char *type)
{
static int encryption_mode_to_flag(const struct flag_list* list, const char* mode,
const char* type) {
const struct flag_list *j;
for (j = list; j->name; ++j) {
@ -147,9 +146,7 @@ static unsigned int encryption_mode_to_flag(const struct flag_list *list,
return 0;
}
static const char *flag_to_encryption_mode(const struct flag_list *list,
unsigned int flag)
{
static const char* flag_to_encryption_mode(const struct flag_list* list, int flag) {
const struct flag_list *j;
for (j = list; j->name; ++j) {

4
fs_mgr/include_fstab/fstab/fstab.h
View File

@ -54,8 +54,8 @@ struct fstab_rec {
int max_comp_streams;
off64_t zram_size;
off64_t reserved_size;
off64_t file_contents_mode;
off64_t file_names_mode;
int file_contents_mode;
int file_names_mode;
off64_t erase_blk_size;
off64_t logical_blk_size;
char* sysfs_path;