Skip to content

Commit a01be93

Browse files
committed
Squashed 'littlefs/' changes from 3513ff1..f53a0cc
f53a0cc Merge pull request #929 from littlefs-project/devel 42910bc Bumped minor version to v2.9 a3e1d12 Merge pull request #915 from littlefs-project/well-done a70870c Renamed internal functions _raw* -> _*_ ceb17a0 Merge pull request #917 from tomscii/fix_return_value_of_lfs_rename a8a0905 Merge pull request #916 from littlefs-project/ci-ubuntu-latest 13d7861 Merge pull request #914 from littlefs-project/inline-max 8b8fd14 Added inline_max, to optionally limit the size of inlined files 09972a1 Merge pull request #913 from littlefs-project/gc-compactions ed7bd05 Merge pull request #912 from littlefs-project/relaxed-lookahead b5cd957 Extended lfs_fs_gc to compact metadata, compact_thresh 1195d60 Merge pull request #909 from littlefs-project/easy-util-defines 1711bde Merge pull request #886 from BrianPugh/macro-sanity-check f522ed9 Added tests over rename type errors 4f32738 Fix return value of lfs_rename() 6691718 Restricted LFS_FILE_MAX to signed 32-bits, <2^31, <=2147483647 1fefcbb Rearranged compile-time constant checks to live near lfs_init 6056767 Relaxed alignment requirements for lfs_malloc 897b571 Changed CI to just run on ubuntu-latest b1b10c0 Relaxed lookahead buffer alignment 1f9c3c0 Reworked the block allocator so the logic is hopefully simpler 7b68441 Renamed a number of internal block-allocator fields 9a620c7 Added LFS_CRC, easier override for lfs_crc a0c6c54 Added LFS_MALLOC/FREE, easier overrides for lfs_malloc/free c531a5e Replace erroneous LFS_FILE_MAX upper bound 4294967296 to 4294967295 8f9427d Add value-range checks for user-definable macros git-subtree-dir: littlefs git-subtree-split: f53a0cc961a8acac85f868b431d2f3e58e447ba3
1 parent 530ff95 commit a01be93

File tree

17 files changed

+447
-242
lines changed

17 files changed

+447
-242
lines changed

.github/workflows/post-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ defaults:
1010

1111
jobs:
1212
post-release:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-latest
1414
steps:
1515
# trigger post-release in dependency repo, this indirection allows the
1616
# dependency repo to be updated often without affecting this repo. At

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ defaults:
1111

1212
jobs:
1313
release:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-latest
1515

1616
# need to manually check for a couple things
1717
# - tests passed?

.github/workflows/status.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ defaults:
1111
jobs:
1212
# forward custom statuses
1313
status:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: dawidd6/action-download-artifact@v2
1717
continue-on-error: true
@@ -60,7 +60,7 @@ jobs:
6060
6161
# forward custom pr-comments
6262
comment:
63-
runs-on: ubuntu-22.04
63+
runs-on: ubuntu-latest
6464

6565
# only run on success (we don't want garbage comments!)
6666
if: ${{github.event.workflow_run.conclusion == 'success'}}

.github/workflows/test.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
# run tests
1616
test:
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-latest
1818
strategy:
1919
fail-fast: false
2020
matrix:
@@ -329,7 +329,7 @@ jobs:
329329
#
330330
# this grows exponentially, so it doesn't turn out to be that many
331331
test-pls:
332-
runs-on: ubuntu-22.04
332+
runs-on: ubuntu-latest
333333
strategy:
334334
fail-fast: false
335335
matrix:
@@ -359,7 +359,7 @@ jobs:
359359
360360
# run with LFS_NO_INTRINSICS to make sure that works
361361
test-no-intrinsics:
362-
runs-on: ubuntu-22.04
362+
runs-on: ubuntu-latest
363363
steps:
364364
- uses: actions/checkout@v2
365365
- name: install
@@ -376,7 +376,7 @@ jobs:
376376
377377
# run LFS_MULTIVERSION tests
378378
test-multiversion:
379-
runs-on: ubuntu-22.04
379+
runs-on: ubuntu-latest
380380
steps:
381381
- uses: actions/checkout@v2
382382
- name: install
@@ -393,7 +393,7 @@ jobs:
393393
394394
# run tests on the older version lfs2.0
395395
test-lfs2_0:
396-
runs-on: ubuntu-22.04
396+
runs-on: ubuntu-latest
397397
steps:
398398
- uses: actions/checkout@v2
399399
- name: install
@@ -412,7 +412,7 @@ jobs:
412412
413413
# run under Valgrind to check for memory errors
414414
test-valgrind:
415-
runs-on: ubuntu-22.04
415+
runs-on: ubuntu-latest
416416
steps:
417417
- uses: actions/checkout@v2
418418
- name: install
@@ -434,7 +434,7 @@ jobs:
434434
# test that compilation is warning free under clang
435435
# run with Clang, mostly to check for Clang-specific warnings
436436
test-clang:
437-
runs-on: ubuntu-22.04
437+
runs-on: ubuntu-latest
438438
steps:
439439
- uses: actions/checkout@v2
440440
- name: install
@@ -457,7 +457,7 @@ jobs:
457457
#
458458
# note there's no real benefit to running these on multiple archs
459459
bench:
460-
runs-on: ubuntu-22.04
460+
runs-on: ubuntu-latest
461461
steps:
462462
- uses: actions/checkout@v2
463463
- name: install
@@ -533,7 +533,7 @@ jobs:
533533

534534
# run compatibility tests using the current master as the previous version
535535
test-compat:
536-
runs-on: ubuntu-22.04
536+
runs-on: ubuntu-latest
537537
steps:
538538
- uses: actions/checkout@v2
539539
if: ${{github.event_name == 'pull_request'}}
@@ -569,7 +569,7 @@ jobs:
569569
570570
# self-host with littlefs-fuse for a fuzz-like test
571571
fuse:
572-
runs-on: ubuntu-22.04
572+
runs-on: ubuntu-latest
573573
if: ${{!endsWith(github.ref, '-prefix')}}
574574
steps:
575575
- uses: actions/checkout@v2
@@ -619,7 +619,7 @@ jobs:
619619
620620
# test migration using littlefs-fuse
621621
migrate:
622-
runs-on: ubuntu-22.04
622+
runs-on: ubuntu-latest
623623
if: ${{!endsWith(github.ref, '-prefix')}}
624624
steps:
625625
- uses: actions/checkout@v2
@@ -691,7 +691,7 @@ jobs:
691691
692692
# status related tasks that run after tests
693693
status:
694-
runs-on: ubuntu-22.04
694+
runs-on: ubuntu-latest
695695
needs: [test, bench]
696696
steps:
697697
- uses: actions/checkout@v2

bd/lfs_emubd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ int lfs_emubd_sync(const struct lfs_config *cfg) {
451451

452452
/// Additional extended API for driving test features ///
453453

454-
static int lfs_emubd_rawcrc(const struct lfs_config *cfg,
454+
static int lfs_emubd_crc_(const struct lfs_config *cfg,
455455
lfs_block_t block, uint32_t *crc) {
456456
lfs_emubd_t *bd = cfg->context;
457457

@@ -480,7 +480,7 @@ int lfs_emubd_crc(const struct lfs_config *cfg,
480480
lfs_block_t block, uint32_t *crc) {
481481
LFS_EMUBD_TRACE("lfs_emubd_crc(%p, %"PRIu32", %p)",
482482
(void*)cfg, block, crc);
483-
int err = lfs_emubd_rawcrc(cfg, block, crc);
483+
int err = lfs_emubd_crc_(cfg, block, crc);
484484
LFS_EMUBD_TRACE("lfs_emubd_crc -> %d", err);
485485
return err;
486486
}
@@ -491,7 +491,7 @@ int lfs_emubd_bdcrc(const struct lfs_config *cfg, uint32_t *crc) {
491491
uint32_t crc_ = 0xffffffff;
492492
for (lfs_block_t i = 0; i < cfg->block_count; i++) {
493493
uint32_t i_crc;
494-
int err = lfs_emubd_rawcrc(cfg, i, &i_crc);
494+
int err = lfs_emubd_crc_(cfg, i, &i_crc);
495495
if (err) {
496496
LFS_EMUBD_TRACE("lfs_emubd_bdcrc -> %d", err);
497497
return err;

0 commit comments

Comments
 (0)