This is an automated email from the ASF dual-hosted git repository.
xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 82fb723bdec fs/littlefs: add block_size_factor mount option
82fb723bdec is described below
commit 82fb723bdec599a02ffad66934d6096ede826af1
Author: alexcekay <[email protected]>
AuthorDate: Tue Jun 2 13:44:01 2026 +0200
fs/littlefs: add block_size_factor mount option
When a board switches storage technology but wants to mount a littlefs
filesystem onto this storage it is desired to still use the same firmware.
This almost works out of the box in NuttX with the exception of setting the
correct block size, which may be different depending on the used storage.
An incorrect block size may lead to suboptimal performance or worse.
To avoid writing a firmware variant that only differs by
CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR this adds the option to pass the
intended block size at the mount call. To still enable the usage of the
existing
options this adds a parser for comma-separated mount options, allowing
multiple
options to be passed simultaneously.
Example: "autoformat,block_size_factor=4",
"autoformat,block_size_factor=1"
This is backwards compatible: single options passed without commas continue
to
work as before.
Signed-off-by: alexcekay <[email protected]>
---
fs/littlefs/lfs_vfs.c | 46 ++++++++++++++++++++++++++++++++++++++++------
1 file changed, 40 insertions(+), 6 deletions(-)
diff --git a/fs/littlefs/lfs_vfs.c b/fs/littlefs/lfs_vfs.c
index 780c0d8a10f..1a4208e3364 100644
--- a/fs/littlefs/lfs_vfs.c
+++ b/fs/littlefs/lfs_vfs.c
@@ -28,6 +28,7 @@
#include <errno.h>
#include <fcntl.h>
+#include <stdio.h>
#include <string.h>
#include <nuttx/crc16.h>
@@ -1342,6 +1343,9 @@ static int littlefs_bind(FAR struct inode *driver, FAR
const void *data,
{
FAR struct littlefs_mountpt_s *fs;
int ret;
+ int block_size_factor = CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR;
+ bool autoformat = false;
+ bool forceformat = false;
/* Open the block driver */
@@ -1415,6 +1419,38 @@ static int littlefs_bind(FAR struct inode *driver, FAR
const void *data,
goto errout_with_fs;
}
+ /* Parse comma-separated mount options. Recognised tokens:
+ * autoformat - format if mount fails
+ * forceformat - always format before mounting
+ * block_size_factor=N - override CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR
+ */
+
+ if (data != NULL)
+ {
+ FAR const char *p = data;
+
+ while (*p != '\0')
+ {
+ FAR const char *end = strchrnul(p, ',');
+ size_t len = end - p;
+
+ if (strncmp(p, "autoformat", len) == 0)
+ {
+ autoformat = true;
+ }
+ else if (strncmp(p, "forceformat", len) == 0)
+ {
+ forceformat = true;
+ }
+ else
+ {
+ sscanf(p, "block_size_factor=%d", &block_size_factor);
+ }
+
+ p = (*end != '\0') ? end + 1 : end;
+ }
+ }
+
/* Initialize lfs_config structure */
fs->cfg.context = fs;
@@ -1426,10 +1462,8 @@ static int littlefs_bind(FAR struct inode *driver, FAR
const void *data,
CONFIG_FS_LITTLEFS_READ_SIZE_FACTOR;
fs->cfg.prog_size = fs->geo.blocksize *
CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR;
- fs->cfg.block_size = fs->geo.erasesize *
- CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR;
- fs->cfg.block_count = fs->geo.neraseblocks /
- CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR;
+ fs->cfg.block_size = fs->geo.erasesize * block_size_factor;
+ fs->cfg.block_count = fs->geo.neraseblocks / block_size_factor;
fs->cfg.block_cycles = CONFIG_FS_LITTLEFS_BLOCK_CYCLE;
fs->cfg.cache_size = fs->geo.blocksize *
CONFIG_FS_LITTLEFS_CACHE_SIZE_FACTOR;
@@ -1451,7 +1485,7 @@ static int littlefs_bind(FAR struct inode *driver, FAR
const void *data,
/* Force format the device if -o forceformat */
- if (data && strcmp(data, "forceformat") == 0)
+ if (forceformat)
{
ret = littlefs_convert_result(lfs_format(&fs->lfs, &fs->cfg));
if (ret < 0)
@@ -1470,7 +1504,7 @@ static int littlefs_bind(FAR struct inode *driver, FAR
const void *data,
{
/* Auto format the device if -o autoformat */
- if (ret != -EFAULT || !data || strcmp(data, "autoformat"))
+ if (ret != -EFAULT || !autoformat)
{
goto errout_with_fs;
}
