From 55f84a2ead7068e2b50047e68dd25454ba2a76d6 Mon Sep 17 00:00:00 2001 From: JING Date: Wed, 21 Apr 2021 14:58:39 +0800 Subject: [PATCH] =?UTF-8?q?/userdata=E7=9B=AE=E5=BD=95=E8=8B=A5=E5=B7=B2?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=EF=BC=8C=E4=BB=8D=E7=84=B6=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/common/los_rootfs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kernel/common/los_rootfs.c b/kernel/common/los_rootfs.c index 911c5ba8..b6ec655b 100644 --- a/kernel/common/los_rootfs.c +++ b/kernel/common/los_rootfs.c @@ -429,9 +429,8 @@ STATIC VOID OsMountUserdata(const CHAR *fsType) INT32 err; const CHAR *userdataDir = "/userdata"; ret = mkdir(userdataDir, VFAT_STORAGE_MOUNT_DIR_MODE); - if (ret != LOS_OK) { - err = get_errno(); - PRINT_ERR("Failed to reserve vnode /userdata, errno %d: %s\n", err, strerror(err)); + if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) { + PRINT_ERR("Failed to mkdir /userdata, errno %d: %s\n", err, strerror(err)); return; } CHAR emmcUserdataDev[DISK_NAME] = {0}; @@ -479,7 +478,7 @@ STATIC INT32 OsMountRootfsAndUserfs(const CHAR *rootDev, const CHAR *fsType) #ifdef LOSCFG_STORAGE_EMMC ret = mkdir("/storage", VFAT_STORAGE_MOUNT_DIR_MODE); 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)); } else { CHAR emmcStorageDev[DISK_NAME] = {0}; if (snprintf_s(emmcStorageDev, sizeof(emmcStorageDev), sizeof(emmcStorageDev) - 1, @@ -505,7 +504,7 @@ 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) ret = mkdir("/storage", DEFAULT_STORAGE_MOUNT_DIR_MODE); 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)); } else { ret = mount(DEV_STORAGE_PATH, "/storage", fsType, 0, NULL); if (ret != LOS_OK) {