ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: add sysfs_path=%s to indicate a location of sysfs entry"

Browse source
This commit is contained in:
Jaegeuk Kim 2018-02-27 06:20:23 +00:00 • committed by Gerrit Code Review
commit badaa56639
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs_mgr/fs_mgr_fstab.cpp
View file

@ -39,6 +39,7 @@ struct fs_mgr_flag_values {
char *key_loc; char *key_loc;
char* key_dir; char* key_dir;
char *verity_loc; char *verity_loc;
char *sysfs_path;
long long part_length; long long part_length;
char *label; char *label;
int partnum; int partnum;
@ -104,6 +105,7 @@ static struct flag_list fs_mgr_flags[] = {
{"quota", MF_QUOTA}, {"quota", MF_QUOTA},
{"eraseblk=", MF_ERASEBLKSIZE}, {"eraseblk=", MF_ERASEBLKSIZE},
{"logicalblk=", MF_LOGICALBLKSIZE}, {"logicalblk=", MF_LOGICALBLKSIZE},
{"sysfs_path=", MF_SYSFS},
{"defaults", 0}, {"defaults", 0},
{0, 0}, {0, 0},
}; };
@ -341,6 +343,9 @@ static int parse_flags(char *flags, struct flag_list *fl,
unsigned int val = strtoul(strchr(p, '=') + 1, NULL, 0); unsigned int val = strtoul(strchr(p, '=') + 1, NULL, 0);
if (val >= 4096 && (val & (val - 1)) == 0) if (val >= 4096 && (val & (val - 1)) == 0)
flag_vals->logical_blk_size = val; flag_vals->logical_blk_size = val;
} else if ((fl[i].flag == MF_SYSFS) && flag_vals) {
/* The path to trigger device gc by idle-maint of vold. */
flag_vals->sysfs_path = strdup(strchr(p, '=') + 1);
} }
break; break;
} }
@ -615,6 +620,7 @@ static struct fstab *fs_mgr_read_fstab_file(FILE *fstab_file)
fstab->recs[cnt].file_names_mode = flag_vals.file_names_mode; fstab->recs[cnt].file_names_mode = flag_vals.file_names_mode;
fstab->recs[cnt].erase_blk_size = flag_vals.erase_blk_size; fstab->recs[cnt].erase_blk_size = flag_vals.erase_blk_size;
fstab->recs[cnt].logical_blk_size = flag_vals.logical_blk_size; fstab->recs[cnt].logical_blk_size = flag_vals.logical_blk_size;
fstab->recs[cnt].sysfs_path = flag_vals.sysfs_path;
cnt++; cnt++;
} }
/* If an A/B partition, modify block device to be the real block device */ /* If an A/B partition, modify block device to be the real block device */
@ -787,6 +793,7 @@ void fs_mgr_free_fstab(struct fstab *fstab)
free(fstab->recs[i].key_loc); free(fstab->recs[i].key_loc);
free(fstab->recs[i].key_dir); free(fstab->recs[i].key_dir);
free(fstab->recs[i].label); free(fstab->recs[i].label);
free(fstab->recs[i].sysfs_path);
} }
/* Free the fstab_recs array created by calloc(3) */ /* Free the fstab_recs array created by calloc(3) */
@ -922,3 +929,8 @@ int fs_mgr_is_latemount(const struct fstab_rec* fstab) {
int fs_mgr_is_quota(const struct fstab_rec* fstab) { int fs_mgr_is_quota(const struct fstab_rec* fstab) {
return fstab->fs_mgr_flags & MF_QUOTA; return fstab->fs_mgr_flags & MF_QUOTA;
} }
int fs_mgr_has_sysfs_path(const struct fstab_rec *fstab)
{
return fstab->fs_mgr_flags & MF_SYSFS;
}

3
fs_mgr/fs_mgr_priv.h
View file

@ -109,7 +109,8 @@
#define MF_ERASEBLKSIZE 0x800000 #define MF_ERASEBLKSIZE 0x800000
#define MF_LOGICALBLKSIZE 0X1000000 #define MF_LOGICALBLKSIZE 0X1000000
#define MF_AVB 0X2000000 #define MF_AVB 0X2000000
#define MF_KEYDIRECTORY 0X4000000 #define MF_KEYDIRECTORY 0X4000000
#define MF_SYSFS 0X8000000
#define DM_BUF_SIZE 4096 #define DM_BUF_SIZE 4096

2
fs_mgr/include_fstab/fstab/fstab.h
View file

@ -56,6 +56,7 @@ struct fstab_rec {
unsigned int file_names_mode; unsigned int file_names_mode;
unsigned int erase_blk_size; unsigned int erase_blk_size;
unsigned int logical_blk_size; unsigned int logical_blk_size;
char* sysfs_path;
}; };
struct fstab* fs_mgr_read_fstab_default(); struct fstab* fs_mgr_read_fstab_default();
@ -83,6 +84,7 @@ int fs_mgr_is_slotselect(const struct fstab_rec* fstab);
int fs_mgr_is_nofail(const struct fstab_rec* fstab); int fs_mgr_is_nofail(const struct fstab_rec* fstab);
int fs_mgr_is_latemount(const struct fstab_rec* fstab); int fs_mgr_is_latemount(const struct fstab_rec* fstab);
int fs_mgr_is_quota(const struct fstab_rec* fstab); int fs_mgr_is_quota(const struct fstab_rec* fstab);
int fs_mgr_has_sysfs_path(const struct fstab_rec* fstab);
std::string fs_mgr_get_slot_suffix(); std::string fs_mgr_get_slot_suffix();