From 34d4492a9fdb056ffc36e671542ea3698d7ab918 Mon Sep 17 00:00:00 2001 From: Guangyao Ma Date: Mon, 29 Mar 2021 20:58:05 +0800 Subject: [PATCH] fix(jffs2):adapt the new jffs fs for qemu Change-Id: Ifc686534b32bc3a5ee68af1fcf81c1937d8ed5d1 --- fs/jffs2/super.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 3c1ab44..676e8f1 100755 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -94,7 +94,11 @@ int jffs2_mount(int part_no, struct jffs2_inode **root_node) if (mtd_part->patitionnum == part_no) break; } +#ifndef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 spinor_mtd = GetMtd("spinor"); +#else + spinor_mtd = (struct MtdDev *)LOS_DL_LIST_ENTRY(part_head->pstNext, mtd_partition, node_info)->mtd_info; +#endif if (spinor_mtd == NULL) { free(sb); return -EPERM; @@ -102,7 +106,9 @@ int jffs2_mount(int part_no, struct jffs2_inode **root_node) jffs2_dev_list[part_no].blockEnd = mtd_part->end_block; jffs2_dev_list[part_no].blockSize = spinor_mtd->eraseSize; jffs2_dev_list[part_no].blockStart = mtd_part->start_block; +#ifndef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 (void)FreeMtd(spinor_mtd); +#endif sb->jffs2_sb.mtd = mtd_part->mtd_info; sb->s_dev = &jffs2_dev_list[part_no]; -- Gitee