yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!830 lfs_mount 不能多实例 

Merge pull request !830 from wangchen/0922_m
This commit is contained in:
openharmony_ci 2022-09-26 13:09:18 +00:00 committed by Gitee
parent 816d03f5c1 cf50cde1b7
commit 8fc9852e34
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/fs/littlefs/lfs_adapter.c
View File

@ -43,7 +43,6 @@
static pthread_mutex_t g_fsLocalMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t g_fsLocalMutex = PTHREAD_MUTEX_INITIALIZER;
static struct PartitionCfg g_partitionCfg; static struct PartitionCfg g_partitionCfg;
static struct lfs_config g_lfsCfg;
static struct DeviceDesc *g_lfsDevice = NULL; static struct DeviceDesc *g_lfsDevice = NULL;
static uint32_t LfsGetStartAddr(int partition) static uint32_t LfsGetStartAddr(int partition)
@ -177,6 +176,7 @@ int LfsMount(struct MountPoint *mp, unsigned long mountflags, const void *data)
{ {
int ret; int ret;
lfs_t *mountHdl = NULL; lfs_t *mountHdl = NULL;
struct lfs_config *cfg = NULL;
if ((mp == NULL) || (mp->mPath == NULL) || (data == NULL)) { if ((mp == NULL) || (mp->mPath == NULL) || (data == NULL)) {
errno = EFAULT; errno = EFAULT;
@ -184,22 +184,23 @@ int LfsMount(struct MountPoint *mp, unsigned long mountflags, const void *data)
goto errout; goto errout;
} }
mountHdl = (lfs_t *)malloc(sizeof(lfs_t)); mountHdl = (lfs_t *)malloc(sizeof(lfs_t) + sizeof(struct lfs_config));
if (mountHdl == NULL) { if (mountHdl == NULL) {
errno = ENODEV; errno = ENODEV;
ret = (int)LOS_NOK; ret = (int)LOS_NOK;
goto errout; goto errout;
} }
(void)memset_s(mountHdl, sizeof(lfs_t), 0, sizeof(lfs_t)); (void)memset_s(mountHdl, sizeof(lfs_t) + sizeof(struct lfs_config), 0, sizeof(lfs_t) + sizeof(struct lfs_config));
mp->mData = (void *)mountHdl; mp->mData = (void *)mountHdl;
cfg = (void *)((UINTPTR)mountHdl + sizeof(lfs_t));
LfsConfigAdapter((struct PartitionCfg *)data, &g_lfsCfg); LfsConfigAdapter((struct PartitionCfg *)data, cfg);
ret = lfs_mount((lfs_t *)mp->mData, &g_lfsCfg); ret = lfs_mount((lfs_t *)mp->mData, cfg);
if (ret != 0) { if (ret != 0) {
ret = lfs_format((lfs_t *)mp->mData, &g_lfsCfg); ret = lfs_format((lfs_t *)mp->mData, cfg);
if (ret == 0) { if (ret == 0) {
ret = lfs_mount((lfs_t *)mp->mData, &g_lfsCfg); ret = lfs_mount((lfs_t *)mp->mData, cfg);
} }
} }
if (ret != 0) { if (ret != 0) {
@ -655,12 +656,13 @@ int LfsFormat(const char *partName, void *privData)
{ {
int ret; int ret;
lfs_t lfs = {0}; lfs_t lfs = {0};
struct lfs_config cfg = {0};
(void)partName; (void)partName;
LfsConfigAdapter((struct PartitionCfg *)privData, &g_lfsCfg); LfsConfigAdapter((struct PartitionCfg *)privData, &cfg);
ret = lfs_format(&lfs, &g_lfsCfg); ret = lfs_format(&lfs, &cfg);
if (ret != 0) { if (ret != 0) {
errno = LittlefsErrno(ret); errno = LittlefsErrno(ret);
ret = (int)LOS_NOK; ret = (int)LOS_NOK;