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

!170 若/userdata目录已存在，继续挂载userdata分区 

Merge pull request !170 from JING/master
This commit is contained in:
openharmony_ci 2021-04-22 15:19:54 +08:00 committed by Gitee
parent ba778ec212 da6ca200fb
commit 3e5dec4dc9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/common/los_rootfs.c
View File

@ -429,9 +429,8 @@ STATIC VOID OsMountUserdata(const CHAR *fsType)
INT32 err; INT32 err;
const CHAR *userdataDir = "/userdata"; const CHAR *userdataDir = "/userdata";
ret = mkdir(userdataDir, VFAT_STORAGE_MOUNT_DIR_MODE); ret = mkdir(userdataDir, VFAT_STORAGE_MOUNT_DIR_MODE);
if (ret != LOS_OK) { if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) {
err = get_errno(); PRINT_ERR("Failed to mkdir /userdata, errno %d: %s\n", err, strerror(err));
PRINT_ERR("Failed to reserve vnode /userdata, errno %d: %s\n", err, strerror(err));
return; return;
} }
CHAR emmcUserdataDev[DISK_NAME] = {0}; CHAR emmcUserdataDev[DISK_NAME] = {0};
@ -479,7 +478,8 @@ STATIC INT32 OsMountRootfsAndUserfs(const CHAR *rootDev, const CHAR *fsType)
#ifdef LOSCFG_STORAGE_EMMC #ifdef LOSCFG_STORAGE_EMMC
ret = mkdir("/storage", VFAT_STORAGE_MOUNT_DIR_MODE); ret = mkdir("/storage", VFAT_STORAGE_MOUNT_DIR_MODE);
if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) { if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) {
PRINT_ERR("Failed to reserve vnode /storage, errno %d: %s\n", err, strerror(err)); PRINT_ERR("Failed to mkdir /storage, errno %d: %s\n", err, strerror(err));
return ret;
} else { } else {
CHAR emmcStorageDev[DISK_NAME] = {0}; CHAR emmcStorageDev[DISK_NAME] = {0};
if (snprintf_s(emmcStorageDev, sizeof(emmcStorageDev), sizeof(emmcStorageDev) - 1, if (snprintf_s(emmcStorageDev, sizeof(emmcStorageDev), sizeof(emmcStorageDev) - 1,
@ -505,7 +505,8 @@ STATIC INT32 OsMountRootfsAndUserfs(const CHAR *rootDev, const CHAR *fsType)
#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) #if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)
ret = mkdir("/storage", DEFAULT_STORAGE_MOUNT_DIR_MODE); ret = mkdir("/storage", DEFAULT_STORAGE_MOUNT_DIR_MODE);
if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) { if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) {
PRINT_ERR("Failed to reserve vnode /storage, errno %d: %s\n", err, strerror(err)); PRINT_ERR("Failed to mkdir /storage, errno %d: %s\n", err, strerror(err));
return ret;
} else { } else {
ret = mount(DEV_STORAGE_PATH, "/storage", fsType, 0, NULL); ret = mount(DEV_STORAGE_PATH, "/storage", fsType, 0, NULL);
if (ret != LOS_OK) { if (ret != LOS_OK) {