Github/littlefs
1
Fork 0
Code Actions Activity

Renamed lfsr_fs_size -> lfsr_fs_usage

Browse Source 
This better matches how other filesystems refer to the number of in-use
blocks.

Which makes sense when you consider that "size" could also refer to the
configured block_count. The term "usage" avoids this ambiguity.
This commit is contained in:
Christopher Haster
2025-05-01 00:37:07 -05:00
parent 4a50c5c9ce
commit 9f2f0b92e9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+1 -1
View File
@@ -14406,7 +14406,7 @@ int lfsr_fs_stat(lfs_t *lfs, struct lfs_fsinfo *fsinfo) {
return 0; return 0;
} }
lfs_ssize_t lfsr_fs_size(lfs_t *lfs) { lfs_ssize_t lfsr_fs_usage(lfs_t *lfs) {
lfs_size_t count = 0; lfs_size_t count = 0;
lfsr_traversal_t t; lfsr_traversal_t t;
lfsr_traversal_init(&t, 0); lfsr_traversal_init(&t, 0);
lfs.h
+3 -3
View File
@@ -1261,14 +1261,14 @@ int lfsr_traversal_rewind(lfs_t *lfs, lfsr_traversal_t *t);
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfsr_fs_stat(lfs_t *lfs, struct lfs_fsinfo *fsinfo); int lfsr_fs_stat(lfs_t *lfs, struct lfs_fsinfo *fsinfo);
// Finds the current size of the filesystem // Finds the number of blocks in use by the filesystem
// //
// Note: Result is best effort. If files share COW structures, the returned // Note: Result is best effort. If files share COW structures, the returned
// size may be larger than the filesystem actually is. // usage may be larger than the filesystem actually is.
// //
// Returns the number of allocated blocks, or a negative error code on failure. // Returns the number of allocated blocks, or a negative error code on failure.
//lfs_ssize_t lfs_fs_size(lfs_t *lfs); //lfs_ssize_t lfs_fs_size(lfs_t *lfs);
lfs_ssize_t lfsr_fs_size(lfs_t *lfs); lfs_ssize_t lfsr_fs_usage(lfs_t *lfs);
// Traverse through all blocks in use by the filesystem // Traverse through all blocks in use by the filesystem
// //
tests/test_grow.toml
+8 -8
View File
@@ -472,7 +472,7 @@ code = '''
lfsr_fs_stat(&lfs, &fsinfo) => 0; lfsr_fs_stat(&lfs, &fsinfo) => 0;
assert(fsinfo.block_count >= INIT_BLOCK_COUNT); assert(fsinfo.block_count >= INIT_BLOCK_COUNT);
assert(fsinfo.block_count <= BLOCK_COUNT); assert(fsinfo.block_count <= BLOCK_COUNT);
lfs_ssize_t used = lfsr_fs_size(&lfs); lfs_ssize_t used = lfsr_fs_usage(&lfs);
assert(used >= 0); assert(used >= 0);
// we may need to grow multiple blocks before the system gets unstuck // we may need to grow multiple blocks before the system gets unstuck
@@ -708,7 +708,7 @@ code = '''
lfsr_fs_stat(&lfs, &fsinfo) => 0; lfsr_fs_stat(&lfs, &fsinfo) => 0;
assert(fsinfo.block_count >= INIT_BLOCK_COUNT); assert(fsinfo.block_count >= INIT_BLOCK_COUNT);
assert(fsinfo.block_count <= BLOCK_COUNT); assert(fsinfo.block_count <= BLOCK_COUNT);
lfs_ssize_t used = lfsr_fs_size(&lfs); lfs_ssize_t used = lfsr_fs_usage(&lfs);
assert(used >= 0); assert(used >= 0);
// we may need to grow multiple blocks before the system gets unstuck // we may need to grow multiple blocks before the system gets unstuck
@@ -868,7 +868,7 @@ code = '''
lfsr_fs_stat(&lfs, &fsinfo) => 0; lfsr_fs_stat(&lfs, &fsinfo) => 0;
assert(fsinfo.block_count >= INIT_BLOCK_COUNT); assert(fsinfo.block_count >= INIT_BLOCK_COUNT);
assert(fsinfo.block_count <= BLOCK_COUNT); assert(fsinfo.block_count <= BLOCK_COUNT);
lfs_ssize_t used = lfsr_fs_size(&lfs); lfs_ssize_t used = lfsr_fs_usage(&lfs);
assert(used >= 0); assert(used >= 0);
// we may need to grow multiple blocks before the system gets unstuck // we may need to grow multiple blocks before the system gets unstuck
@@ -1134,7 +1134,7 @@ code = '''
lfsr_fs_stat(&lfs, &fsinfo) => 0; lfsr_fs_stat(&lfs, &fsinfo) => 0;
assert(fsinfo.block_count >= INIT_BLOCK_COUNT); assert(fsinfo.block_count >= INIT_BLOCK_COUNT);
assert(fsinfo.block_count <= BLOCK_COUNT); assert(fsinfo.block_count <= BLOCK_COUNT);
lfs_ssize_t used = lfsr_fs_size(&lfs); lfs_ssize_t used = lfsr_fs_usage(&lfs);
assert(used >= 0); assert(used >= 0);
// we may need to grow multiple blocks before the system gets unstuck // we may need to grow multiple blocks before the system gets unstuck
@@ -1615,7 +1615,7 @@ code = '''
lfsr_fs_stat(&lfs, &fsinfo) => 0; lfsr_fs_stat(&lfs, &fsinfo) => 0;
assert(fsinfo.block_count >= INIT_BLOCK_COUNT); assert(fsinfo.block_count >= INIT_BLOCK_COUNT);
assert(fsinfo.block_count <= BLOCK_COUNT); assert(fsinfo.block_count <= BLOCK_COUNT);
lfs_ssize_t used = lfsr_fs_size(&lfs); lfs_ssize_t used = lfsr_fs_usage(&lfs);
assert(used >= 0); assert(used >= 0);
// we may need to grow multiple blocks before the system gets unstuck // we may need to grow multiple blocks before the system gets unstuck
@@ -2199,7 +2199,7 @@ code = '''
lfsr_fs_stat(&lfs, &fsinfo) => 0; lfsr_fs_stat(&lfs, &fsinfo) => 0;
assert(fsinfo.block_count >= INIT_BLOCK_COUNT); assert(fsinfo.block_count >= INIT_BLOCK_COUNT);
assert(fsinfo.block_count <= BLOCK_COUNT); assert(fsinfo.block_count <= BLOCK_COUNT);
lfs_ssize_t used = lfsr_fs_size(&lfs); lfs_ssize_t used = lfsr_fs_usage(&lfs);
assert(used >= 0); assert(used >= 0);
// we may need to grow multiple blocks before the system gets unstuck // we may need to grow multiple blocks before the system gets unstuck
@@ -2562,7 +2562,7 @@ code = '''
lfsr_fs_stat(&lfs, &fsinfo) => 0; lfsr_fs_stat(&lfs, &fsinfo) => 0;
assert(fsinfo.block_count >= INIT_BLOCK_COUNT); assert(fsinfo.block_count >= INIT_BLOCK_COUNT);
assert(fsinfo.block_count <= BLOCK_COUNT); assert(fsinfo.block_count <= BLOCK_COUNT);
lfs_ssize_t used = lfsr_fs_size(&lfs); lfs_ssize_t used = lfsr_fs_usage(&lfs);
assert(used >= 0); assert(used >= 0);
// we may need to grow multiple blocks before the system gets unstuck // we may need to grow multiple blocks before the system gets unstuck
@@ -3002,7 +3002,7 @@ code = '''
lfsr_fs_stat(&lfs, &fsinfo) => 0; lfsr_fs_stat(&lfs, &fsinfo) => 0;
assert(fsinfo.block_count >= INIT_BLOCK_COUNT); assert(fsinfo.block_count >= INIT_BLOCK_COUNT);
assert(fsinfo.block_count <= BLOCK_COUNT); assert(fsinfo.block_count <= BLOCK_COUNT);
lfs_ssize_t used = lfsr_fs_size(&lfs); lfs_ssize_t used = lfsr_fs_usage(&lfs);
assert(used >= 0); assert(used >= 0);
// we may need to grow multiple blocks before the system gets unstuck // we may need to grow multiple blocks before the system gets unstuck