Bump littlefs to version 2.9

Author: sosthene-nitrokey

CHANGELOG.md

@@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
--
+### Changed
+
+- Updated to [`littlefs2-sys` v0.3.1](https://github.com/trussed-dev/littlefs2-sys/releases/tag/0.3.1) and [`littlefs` v2.9.3](https://github.com/littlefs-project/littlefs/releases/tag/v2.9.3).
+  - `littlefs2` v2.6 introduced a new on-disk format (lfs2.1).
+    We use the multiversion feature to keep the old on-disk format (lfs2.0) to not break compatibility with older versions of this crate.
 
 ## [v0.5.0](https://github.com/trussed-dev/littlefs2/releases/tag/0.5.0) - 2024-10-25
 

Cargo.toml

@@ -24,7 +24,7 @@ delog = "0.1.0"
 generic-array = "0.14"
 heapless = "0.7"
 littlefs2-core = { version = "0.1", path = "core" }
-littlefs2-sys = "0.2"
+littlefs2-sys = { version = "0.3.1", features = ["multiversion"] }
 
 [dev-dependencies]
 ssmarshal = "1"

README.md

@@ -37,14 +37,14 @@ The low-level bindings are provided by the [littlefs2-sys][littlefs2-sys] librar
 
 The core types that are independent of a specific implementation version are provided by the `littlefs2-core` crate, see the [`core`](./core) directory.  These types are re-exported from the `littlefs2` crate too.
 
-Upstream release: [v2.2.1][upstream-release]
+Upstream release: [v2.9.3][upstream-release]
 
 [geky]: https://github.com/geky
 [littlefs]: https://github.com/littlefs-project/littlefs
 [release-notes-2]: https://github.com/littlefs-project/littlefs/releases/tag/v2.0.0
 [std-fs]: https://doc.rust-lang.org/std/fs/index.html
 [littlefs2-sys]: https://lib.rs/littlefs2-sys
-[upstream-release]: https://github.com/littlefs-project/littlefs/releases/tag/v2.2.1
+[upstream-release]: https://github.com/littlefs-project/littlefs/releases/tag/v2.9.3
 
 ## `no_std`
 

src/fs.rs

@@ -158,6 +158,10 @@ impl<Storage: driver::Storage> Allocation<Storage> {
             name_max: filename_max_plus_one.wrapping_sub(1),
             file_max,
             attr_max,
+            compact_thresh: 0,
+            metadata_max: 0,
+            inline_max: 0,
+            disk_version: 0x0002_0000,
         };
 
         Self {
@@ -1224,6 +1228,28 @@ mod tests {
     use io::Result as LfsResult;
     const_ram_storage!(TestStorage, 4096);
 
+    #[test]
+    fn disk_version() {
+        let mut test_storage = TestStorage::new();
+        Filesystem::format(&mut test_storage).unwrap();
+        Filesystem::mount_and_then(&mut test_storage, |fs| {
+            let mut fs_info = ll::lfs_fsinfo {
+                disk_version: 0,
+                block_size: 0,
+                block_count: 0,
+                name_max: 0,
+                file_max: 0,
+                attr_max: 0,
+            };
+            let return_code =
+                unsafe { ll::lfs_fs_stat(&mut fs.alloc.borrow_mut().state, &mut fs_info) };
+            result_from((), return_code).unwrap();
+            assert_eq!(fs_info.disk_version, 0x0002_0000);
+            Ok(())
+        })
+        .unwrap();
+    }
+
     #[test]
     fn todo() {
         let mut test_storage = TestStorage::new();

src/lib.rs

@@ -175,9 +175,9 @@ pub fn version() -> Version {
 /// Information about the C backend
 #[derive(Clone, Copy, Debug)]
 pub struct Version {
-    /// On-disk format (currently: 2.0)
+    /// On-disk format
     pub format: (u32, u32),
-    /// Backend release (currently: 2.1)
+    /// Backend release
     pub backend: (u32, u32),
 }
 

src/tests.rs

@@ -42,8 +42,8 @@ ram_storage!(
 
 #[test]
 fn version() {
-    assert_eq!(crate::version().format, (2, 0));
-    assert_eq!(crate::version().backend, (2, 2));
+    assert_eq!(crate::version().format, (2, 1));
+    assert_eq!(crate::version().backend, (2, 9));
 }
 
 #[test]