Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 05:55:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "ftl: should pre-allocate eblock for car case"

Browse Source 
This reverts commit 20fcdcf905f279a9c4527be399a90590f458db1f.
The reason is that the erase buffer isn't always used in most cases.

Signed-off-by: jingfei <jingfei@xiaomi.com>
This commit is contained in:
jingfei
2025-06-04 15:47:18 +08:00
committed by Xiang Xiao
parent d12cf1cb75
commit a6fdbc538b
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/mtd/ftl.c
+35 -21
View File
@@ -216,19 +216,6 @@ static int ftl_open(FAR struct inode *inode)
DEBUGASSERT(inode->i_private); DEBUGASSERT(inode->i_private);
dev = inode->i_private; dev = inode->i_private;
if (dev->refs == 0)
{
/* Allocate one, in-memory erase block buffer */
dev->eblock = kmm_malloc(dev->geo.erasesize);
if (!dev->eblock)
{
ferr("ERROR: Failed to allocate an erase block buffer\n");
return -ENOMEM;
}
}
dev->refs++; dev->refs++;
return OK; return OK;
} }
@@ -251,20 +238,17 @@ static int ftl_close(FAR struct inode *inode)
rwb_flush(&dev->rwb); rwb_flush(&dev->rwb);
#endif #endif
if (--dev->refs == 0) if (--dev->refs == 0 && dev->unlinked)
{ {
#ifdef FTL_HAVE_RWBUFFER
rwb_uninitialize(&dev->rwb);
#endif
if (dev->eblock) if (dev->eblock)
{ {
kmm_free(dev->eblock); kmm_free(dev->eblock);
} }
if (dev->unlinked) kmm_free(dev);
{
#ifdef FTL_HAVE_RWBUFFER
rwb_uninitialize(&dev->rwb);
#endif
kmm_free(dev);
}
} }
return OK; return OK;
@@ -478,6 +462,18 @@ static ssize_t ftl_read(FAR struct inode *inode, unsigned char *buffer,
* *
****************************************************************************/ ****************************************************************************/
static int ftl_alloc_eblock(FAR struct ftl_struct_s *dev)
{
if (dev->eblock == NULL)
{
/* Allocate one, in-memory erase block buffer */
dev->eblock = kmm_malloc(dev->geo.erasesize);
}
return dev->eblock != NULL ? OK : -ENOMEM;
}
static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer, static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
off_t startblock, size_t nblocks) off_t startblock, size_t nblocks)
{ {
@@ -509,6 +505,13 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
bool short_write = (remaining < (alignedblock - startblock)); bool short_write = (remaining < (alignedblock - startblock));
ret = ftl_alloc_eblock(dev);
if (ret < 0)
{
ferr("ERROR: Failed to allocate an erase block buffer\n");
return ret;
}
/* Read the full erase block into the buffer */ /* Read the full erase block into the buffer */
rwblock = startblock & ~mask; rwblock = startblock & ~mask;
@@ -602,6 +605,13 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
if (remaining > 0) if (remaining > 0)
{ {
ret = ftl_alloc_eblock(dev);
if (ret < 0)
{
ferr("ERROR: Failed to allocate an erase block buffer\n");
return ret;
}
/* Read the full erase block into the buffer */ /* Read the full erase block into the buffer */
nxfrd = ftl_mtd_bread(dev, alignedblock, dev->blkper, dev->eblock); nxfrd = ftl_mtd_bread(dev, alignedblock, dev->blkper, dev->eblock);
@@ -765,6 +775,10 @@ static int ftl_unlink(FAR struct inode *inode)
#ifdef FTL_HAVE_RWBUFFER #ifdef FTL_HAVE_RWBUFFER
rwb_uninitialize(&dev->rwb); rwb_uninitialize(&dev->rwb);
#endif #endif
if (dev->eblock)
{
kmm_free(dev->eblock);
}
kmm_free(dev); kmm_free(dev);
} }