p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!209 修复/userdata分区擦除后重启，无法挂载的问题 

Merge pull request !209 from JING/camera
This commit is contained in:
openharmony_ci 2021-04-29 21:02:47 +08:00 committed by Gitee
parent de3b0d7fb4 c14d95f8b5
commit 2fb1f0e77c
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/common/los_rootfs.c
View File

@ -444,7 +444,7 @@ STATIC VOID OsMountUserdata(const CHAR *fsType)
return;
}
err = get_errno();
if (err == ENOENT) {
if (err == ENOTSUP) {
#ifdef LOSCFG_FS_FAT
ret = format(emmcUserdataDev, 0, FM_FAT32);
if (ret != LOS_OK) {

27
testsuites/unittest/fs/jffs/smoke/It_vfs_jffs_Dac_001.cpp
View File

@ -41,11 +41,7 @@ static int TestUmask(const char *path)
mode_t mode;
int ret;
struct stat buf = { 0 };
struct stat buf1 = { 0 };
struct stat buf2 = { 0 };
char filename[128] = {0};
char filename1[128] = {0};
char filename2[128] = {0};
printf("%s, %d\n", __FUNCTION__, __LINE__);
@ -58,29 +54,8 @@ static int TestUmask(const char *path)
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = stat(filename, &buf);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(buf.st_mode, 040755, buf.st_mode); // mode: 040755
ICUNIT_ASSERT_EQUAL(buf.st_mode, 040755, buf.st_mode);
rmdir(filename);
sprintf(filename1, "%s/%s", path, "file");
ret = open(filename1, O_CREAT | O_RDWR, HIGHEST_AUTHORITY);
ICUNIT_ASSERT_NOT_EQUAL(ret, -1, ret);
ret = close(ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = stat(filename1, &buf1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(buf1.st_mode, 0100755, buf1.st_mode); // mode: 0100755
unlink(filename1);
sprintf(filename2, "%s/%s", path, "file1");
ret = creat(filename2, HIGHEST_AUTHORITY);
ICUNIT_ASSERT_NOT_EQUAL(ret, -1, ret);
ret = close(ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = stat(filename2, &buf2);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(buf2.st_mode, 0100755, buf2.st_mode); // mode: 0100755
unlink(filename2);
return 0;
}