Github/littlefs
1
Fork 0
Code Actions Activity

Renamed size_limit -> file_limit

Browse Source 
This limits the maximum size of a file, which is also implies the
maximum integer size required to mount.

The exact name is a bit of a toss-up. I originally went with size_limit
to avoid confusion around if file_limit reflected the file size or the
number of files, but since this ends up mapping to lfs_off_t and _not_
lfs_size_t, I think size_limit may be a bit of a bad choice.
This commit is contained in:
Christopher Haster
2024-05-14 00:06:51 -05:00
parent a2b4a95b89
commit 11c948678f
8 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+27 -27
View File
@@ -723,7 +723,7 @@ enum lfsr_tag {
LFSR_TAG_OCOMPAT = 0x0007, LFSR_TAG_OCOMPAT = 0x0007,
LFSR_TAG_GEOMETRY = 0x0009, LFSR_TAG_GEOMETRY = 0x0009,
LFSR_TAG_NAMELIMIT = 0x000c, LFSR_TAG_NAMELIMIT = 0x000c,
LFSR_TAG_SIZELIMIT = 0x000d, LFSR_TAG_FILELIMIT = 0x000d,
// global-state tags // global-state tags
LFSR_TAG_GDELTA = 0x0100, LFSR_TAG_GDELTA = 0x0100,
@@ -8265,35 +8265,35 @@ static int lfsr_mountmroot(lfs_t *lfs, const lfsr_mdir_t *mroot) {
lfs->name_limit = name_limit; lfs->name_limit = name_limit;
// read the size limit // read the file limit
lfs_off_t size_limit = 0x7fffffff; lfs_off_t file_limit = 0x7fffffff;
err = lfsr_mdir_lookup(lfs, mroot, LFSR_TAG_SIZELIMIT, err = lfsr_mdir_lookup(lfs, mroot, LFSR_TAG_FILELIMIT,
&data); &data);
if (err && err != LFS_ERR_NOENT) { if (err && err != LFS_ERR_NOENT) {
return err; return err;
} }
if (err != LFS_ERR_NOENT) { if (err != LFS_ERR_NOENT) {
err = lfsr_data_readleb128(lfs, &data, &size_limit); err = lfsr_data_readleb128(lfs, &data, &file_limit);
if (err && err != LFS_ERR_CORRUPT) { if (err && err != LFS_ERR_CORRUPT) {
return err; return err;
} }
if (err == LFS_ERR_CORRUPT) { if (err == LFS_ERR_CORRUPT) {
size_limit = -1; file_limit = -1;
} }
} }
if (size_limit > lfs->size_limit) { if (file_limit > lfs->file_limit) {
LFS_ERROR("Incompatible size limit (%"PRId32" > %"PRId32")", LFS_ERROR("Incompatible file limit (%"PRId32" > %"PRId32")",
size_limit, file_limit,
lfs->size_limit); lfs->file_limit);
return LFS_ERR_INVAL; return LFS_ERR_INVAL;
} }
lfs->size_limit = size_limit; lfs->file_limit = file_limit;
// check for unknown configs // check for unknown configs
lfsr_tag_t tag; lfsr_tag_t tag;
err = lfsr_mdir_lookupnext(lfs, mroot, LFSR_TAG_SIZELIMIT+1, err = lfsr_mdir_lookupnext(lfs, mroot, LFSR_TAG_FILELIMIT+1,
&tag, NULL); &tag, NULL);
if (err && err != LFS_ERR_NOENT) { if (err && err != LFS_ERR_NOENT) {
return err; return err;
@@ -8506,8 +8506,8 @@ static int lfsr_formatinited(lfs_t *lfs) {
LFSR_TAG_NAMELIMIT, 0, LFSR_TAG_NAMELIMIT, 0,
LFSR_DATA_LLEB128(lfs->name_limit)), LFSR_DATA_LLEB128(lfs->name_limit)),
LFSR_ATTR( LFSR_ATTR(
LFSR_TAG_SIZELIMIT, 0, LFSR_TAG_FILELIMIT, 0,
LFSR_DATA_LEB128(lfs->size_limit)), LFSR_DATA_LEB128(lfs->file_limit)),
LFSR_ATTR( LFSR_ATTR(
LFSR_TAG_BOOKMARK, +1, LFSR_TAG_BOOKMARK, +1,
LFSR_DATA_LEB128(0)))); LFSR_DATA_LEB128(0))));
@@ -11178,8 +11178,8 @@ lfs_ssize_t lfsr_file_write(lfs_t *lfs, lfsr_file_t *file,
// can't write to readonly files // can't write to readonly files
LFS_ASSERT(!lfsr_o_isrdonly(file->m.flags)); LFS_ASSERT(!lfsr_o_isrdonly(file->m.flags));
// would this write make our file larger than our size limit? // would this write make our file larger than our file limit?
if (size > lfs->size_limit - file->pos) { if (size > lfs->file_limit - file->pos) {
return LFS_ERR_FBIG; return LFS_ERR_FBIG;
} }
@@ -11557,7 +11557,7 @@ lfs_soff_t lfsr_file_seek(lfs_t *lfs, lfsr_file_t *file,
} }
// out of range? // out of range?
if (pos_ > lfs->size_limit) { if (pos_ > lfs->file_limit) {
return LFS_ERR_INVAL; return LFS_ERR_INVAL;
} }
@@ -11583,8 +11583,8 @@ lfs_soff_t lfsr_file_size(lfs_t *lfs, lfsr_file_t *file) {
} }
int lfsr_file_truncate(lfs_t *lfs, lfsr_file_t *file, lfs_off_t size_) { int lfsr_file_truncate(lfs_t *lfs, lfsr_file_t *file, lfs_off_t size_) {
// exceeds our size limit? // exceeds our file limit?
if (size_ > lfs->size_limit) { if (size_ > lfs->file_limit) {
return LFS_ERR_FBIG; return LFS_ERR_FBIG;
} }
@@ -11688,8 +11688,8 @@ failed:;
} }
int lfsr_file_fruncate(lfs_t *lfs, lfsr_file_t *file, lfs_off_t size_) { int lfsr_file_fruncate(lfs_t *lfs, lfsr_file_t *file, lfs_off_t size_) {
// exceeds our size limit? // exceeds our file limit?
if (size_ > lfs->size_limit) { if (size_ > lfs->file_limit) {
return LFS_ERR_FBIG; return LFS_ERR_FBIG;
} }
@@ -15286,10 +15286,10 @@ static int lfs_init(lfs_t *lfs, const struct lfs_config *cfg) {
lfs->name_limit = LFS_NAME_MAX; lfs->name_limit = LFS_NAME_MAX;
} }
LFS_ASSERT(lfs->cfg->size_limit <= LFS_FILE_MAX); LFS_ASSERT(lfs->cfg->file_limit <= LFS_FILE_MAX);
lfs->size_limit = lfs->cfg->size_limit; lfs->file_limit = lfs->cfg->file_limit;
if (!lfs->size_limit) { if (!lfs->file_limit) {
lfs->size_limit = LFS_FILE_MAX; lfs->file_limit = LFS_FILE_MAX;
} }
LFS_ASSERT(lfs->cfg->uattr_limit <= LFS_UATTR_MAX); LFS_ASSERT(lfs->cfg->uattr_limit <= LFS_UATTR_MAX);
@@ -15350,14 +15350,14 @@ static int lfs_init(lfs_t *lfs, const struct lfs_config *cfg) {
// block-size. The weight can never exceed size-limit, and the size/jump // block-size. The weight can never exceed size-limit, and the size/jump
// field can never exceed a single block: // field can never exceed a single block:
// //
// t = 2 + log128(size_limit+1) + log128(block_size) // t = 2 + log128(file_limit+1) + log128(block_size)
// //
// Note this is different from LFSR_TAG_DSIZE, which is the worst case // Note this is different from LFSR_TAG_DSIZE, which is the worst case
// tag encoding at compile-time. // tag encoding at compile-time.
// //
uint8_t tag_estimate uint8_t tag_estimate
= 2 = 2
+ (lfs_nlog2(lfs->size_limit+1)+7-1)/7 + (lfs_nlog2(lfs->file_limit+1)+7-1)/7
+ (lfs_nlog2(lfs->cfg->block_size)+7-1)/7; + (lfs_nlog2(lfs->cfg->block_size)+7-1)/7;
LFS_ASSERT(tag_estimate <= LFSR_TAG_DSIZE); LFS_ASSERT(tag_estimate <= LFSR_TAG_DSIZE);
lfs->attr_estimate = 3*tag_estimate + 4; lfs->attr_estimate = 3*tag_estimate + 4;
lfs.h
+2 -2
View File
@@ -249,7 +249,7 @@ struct lfs_config {
// Optional upper limit on files in bytes. No downside for larger files // Optional upper limit on files in bytes. No downside for larger files
// but must be <= LFS_FILE_MAX. Defaults to LFS_FILE_MAX when zero. Stored // but must be <= LFS_FILE_MAX. Defaults to LFS_FILE_MAX when zero. Stored
// in superblock and must be respected by other littlefs drivers. // in superblock and must be respected by other littlefs drivers.
lfs_size_t size_limit; lfs_size_t file_limit;
// TODO document // TODO document
lfs_size_t uattr_limit; lfs_size_t uattr_limit;
@@ -588,7 +588,7 @@ typedef struct lfs {
const struct lfs_config *cfg; const struct lfs_config *cfg;
lfs_size_t name_limit; lfs_size_t name_limit;
lfs_off_t size_limit; lfs_off_t file_limit;
lfs_size_t uattr_limit; lfs_size_t uattr_limit;
lfs_size_t sattr_limit; lfs_size_t sattr_limit;
scripts/dbgbmap.py
+1 -1
View File
@@ -19,7 +19,7 @@ TAG_WCOMPAT = 0x0006
TAG_OCOMPAT = 0x0007 TAG_OCOMPAT = 0x0007
TAG_GEOMETRY = 0x0009 TAG_GEOMETRY = 0x0009
TAG_NAMELIMIT = 0x000c TAG_NAMELIMIT = 0x000c
TAG_SIZELIMIT = 0x000d TAG_FILELIMIT = 0x000d
TAG_GDELTA = 0x0100 TAG_GDELTA = 0x0100
TAG_GRMDELTA = 0x0100 TAG_GRMDELTA = 0x0100
TAG_NAME = 0x0200 TAG_NAME = 0x0200
scripts/dbgbtree.py
+2 -2
View File
@@ -17,7 +17,7 @@ TAG_WCOMPAT = 0x0006
TAG_OCOMPAT = 0x0007 TAG_OCOMPAT = 0x0007
TAG_GEOMETRY = 0x0009 TAG_GEOMETRY = 0x0009
TAG_NAMELIMIT = 0x000c TAG_NAMELIMIT = 0x000c
TAG_SIZELIMIT = 0x000d TAG_FILELIMIT = 0x000d
TAG_GDELTA = 0x0100 TAG_GDELTA = 0x0100
TAG_GRMDELTA = 0x0100 TAG_GRMDELTA = 0x0100
TAG_NAME = 0x0200 TAG_NAME = 0x0200
@@ -171,8 +171,8 @@ def tagrepr(tag, w=None, size=None, off=None):
else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT
else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT
else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY
else 'sizelimit' if (tag & 0xfff) == TAG_SIZELIMIT
else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT
else 'filelimit' if (tag & 0xfff) == TAG_FILELIMIT
else 'config 0x%02x' % (tag & 0xff), else 'config 0x%02x' % (tag & 0xff),
' w%d' % w if w else '', ' w%d' % w if w else '',
' %s' % size if size is not None else '') ' %s' % size if size is not None else '')
scripts/dbglfs.py
+9 -9
View File
@@ -18,7 +18,7 @@ TAG_WCOMPAT = 0x0006
TAG_OCOMPAT = 0x0007 TAG_OCOMPAT = 0x0007
TAG_GEOMETRY = 0x0009 TAG_GEOMETRY = 0x0009
TAG_NAMELIMIT = 0x000c TAG_NAMELIMIT = 0x000c
TAG_SIZELIMIT = 0x000d TAG_FILELIMIT = 0x000d
TAG_GDELTA = 0x0100 TAG_GDELTA = 0x0100
TAG_GRMDELTA = 0x0100 TAG_GRMDELTA = 0x0100
TAG_NAME = 0x0200 TAG_NAME = 0x0200
@@ -202,8 +202,8 @@ def tagrepr(tag, w=None, size=None, off=None):
else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT
else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT
else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY
else 'sizelimit' if (tag & 0xfff) == TAG_SIZELIMIT
else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT
else 'filelimit' if (tag & 0xfff) == TAG_FILELIMIT
else 'config 0x%02x' % (tag & 0xff), else 'config 0x%02x' % (tag & 0xff),
' w%d' % w if w else '', ' w%d' % w if w else '',
' %s' % size if size is not None else '') ' %s' % size if size is not None else '')
@@ -1109,11 +1109,11 @@ class Config:
return None return None
@ft.cached_property @ft.cached_property
def size_limit(self): def file_limit(self):
if TAG_SIZELIMIT in self.config: if TAG_FILELIMIT in self.config:
_, data = self.config[TAG_SIZELIMIT] _, data = self.config[TAG_FILELIMIT]
size_limit, _ = fromleb128(data) file_limit, _ = fromleb128(data)
return size_limit return file_limit
else: else:
return None return None
@@ -1136,10 +1136,10 @@ class Config:
'%x' % f for f in reversed(self.ocompat)) '%x' % f for f in reversed(self.ocompat))
elif tag == TAG_GEOMETRY: elif tag == TAG_GEOMETRY:
return 'geometry %dx%d' % self.geometry return 'geometry %dx%d' % self.geometry
elif tag == TAG_SIZELIMIT:
return 'sizelimit %d' % self.size_limit
elif tag == TAG_NAMELIMIT: elif tag == TAG_NAMELIMIT:
return 'namelimit %d' % self.name_limit return 'namelimit %d' % self.name_limit
elif tag == TAG_FILELIMIT:
return 'filelimit %d' % self.file_limit
else: else:
return 'config 0x%02x %d' % (tag, len(data)) return 'config 0x%02x %d' % (tag, len(data))
scripts/dbgmtree.py
+2 -2
View File
@@ -17,7 +17,7 @@ TAG_WCOMPAT = 0x0006
TAG_OCOMPAT = 0x0007 TAG_OCOMPAT = 0x0007
TAG_GEOMETRY = 0x0009 TAG_GEOMETRY = 0x0009
TAG_NAMELIMIT = 0x000c TAG_NAMELIMIT = 0x000c
TAG_SIZELIMIT = 0x000d TAG_FILELIMIT = 0x000d
TAG_GDELTA = 0x0100 TAG_GDELTA = 0x0100
TAG_GRMDELTA = 0x0100 TAG_GRMDELTA = 0x0100
TAG_NAME = 0x0200 TAG_NAME = 0x0200
@@ -186,8 +186,8 @@ def tagrepr(tag, w=None, size=None, off=None):
else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT
else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT
else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY
else 'sizelimit' if (tag & 0xfff) == TAG_SIZELIMIT
else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT
else 'filelimit' if (tag & 0xfff) == TAG_FILELIMIT
else 'config 0x%02x' % (tag & 0xff), else 'config 0x%02x' % (tag & 0xff),
' w%d' % w if w else '', ' w%d' % w if w else '',
' %s' % size if size is not None else '') ' %s' % size if size is not None else '')
scripts/dbgrbyd.py
+2 -2
View File
@@ -26,7 +26,7 @@ TAG_WCOMPAT = 0x0006
TAG_OCOMPAT = 0x0007 TAG_OCOMPAT = 0x0007
TAG_GEOMETRY = 0x0009 TAG_GEOMETRY = 0x0009
TAG_NAMELIMIT = 0x000c TAG_NAMELIMIT = 0x000c
TAG_SIZELIMIT = 0x000d TAG_FILELIMIT = 0x000d
TAG_GDELTA = 0x0100 TAG_GDELTA = 0x0100
TAG_GRMDELTA = 0x0100 TAG_GRMDELTA = 0x0100
TAG_NAME = 0x0200 TAG_NAME = 0x0200
@@ -176,8 +176,8 @@ def tagrepr(tag, w=None, size=None, off=None):
else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT
else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT
else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY
else 'sizelimit' if (tag & 0xfff) == TAG_SIZELIMIT
else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT
else 'filelimit' if (tag & 0xfff) == TAG_FILELIMIT
else 'config 0x%02x' % (tag & 0xff), else 'config 0x%02x' % (tag & 0xff),
' w%d' % w if w else '', ' w%d' % w if w else '',
' %s' % size if size is not None else '') ' %s' % size if size is not None else '')
scripts/dbgtag.py
+2 -2
View File
@@ -15,7 +15,7 @@ TAG_WCOMPAT = 0x0006
TAG_OCOMPAT = 0x0007 TAG_OCOMPAT = 0x0007
TAG_GEOMETRY = 0x0009 TAG_GEOMETRY = 0x0009
TAG_NAMELIMIT = 0x000c TAG_NAMELIMIT = 0x000c
TAG_SIZELIMIT = 0x000d TAG_FILELIMIT = 0x000d
TAG_GDELTA = 0x0100 TAG_GDELTA = 0x0100
TAG_GRMDELTA = 0x0100 TAG_GRMDELTA = 0x0100
TAG_NAME = 0x0200 TAG_NAME = 0x0200
@@ -128,8 +128,8 @@ def tagrepr(tag, w=None, size=None, off=None):
else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT else 'wcompat' if (tag & 0xfff) == TAG_WCOMPAT
else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT else 'ocompat' if (tag & 0xfff) == TAG_OCOMPAT
else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY else 'geometry' if (tag & 0xfff) == TAG_GEOMETRY
else 'sizelimit' if (tag & 0xfff) == TAG_SIZELIMIT
else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT else 'namelimit' if (tag & 0xfff) == TAG_NAMELIMIT
else 'filelimit' if (tag & 0xfff) == TAG_FILELIMIT
else 'config 0x%02x' % (tag & 0xff), else 'config 0x%02x' % (tag & 0xff),
' w%d' % w if w else '', ' w%d' % w if w else '',
' %s' % size if size is not None else '') ' %s' % size if size is not None else '')