fix: some issues in 2.2

.github/workflows/smoke.yml

@@ -125,7 +125,7 @@ jobs:
           export NYDUS_NYDUSIFY_$version_export=/usr/bin/nydus-$version/nydusify
         done
 
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.51.2
+        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.57.1
         sudo -E make smoke-only
 
   nydus-unit-test:

Cargo.toml

@@ -42,7 +42,7 @@ indexmap = "1"
 lazy_static = "1"
 libc = "0.2"
 log = "0.4.8"
-mio = { version = "0.8", features = ["os-poll", "os-ext"] }
+mio = { version = "0.8.11", features = ["os-poll", "os-ext"] }
 nix = "0.24.0"
 rlimit = "0.9.0"
 serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
@@ -97,4 +97,4 @@ backend-registry = ["nydus-storage/backend-registry"]
 backend-s3 = ["nydus-storage/backend-s3"]
 
 [workspace]
-members = ["api", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]
+members = ["api", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]

rafs/src/lib.rs

@@ -112,7 +112,7 @@ pub trait RafsIoWrite: Write + Seek + 'static {
 
     fn validate_alignment(&mut self, size: usize, alignment: usize) -> Result<usize> {
         if alignment != 0 {
-            let cur = self.seek(SeekFrom::Current(0))?;
+            let cur = self.stream_position()?;
 
             if (size & (alignment - 1) != 0) || (cur & (alignment as u64 - 1) != 0) {
                 return Err(einval!("unaligned data"));

rafs/src/metadata/direct_v6.rs

@@ -652,9 +652,9 @@ impl OndiskInodeWrapper {
         Ok(())
     }
 
-    fn get_entry_count<'a>(
+    fn get_entry_count(
         &self,
-        state: &'a Guard<Arc<DirectMappingState>>,
+        state: &Guard<Arc<DirectMappingState>>,
         inode: &dyn RafsV6OndiskInode,
         block_index: usize,
     ) -> Result<usize> {

rafs/src/metadata/mod.rs

@@ -534,20 +534,15 @@ impl Default for RafsSuperMeta {
 }
 
 /// RAFS filesystem versions.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Default)]
 pub enum RafsVersion {
     /// RAFS v5
+    #[default]
     V5,
     /// RAFS v6
     V6,
 }
 
-impl Default for RafsVersion {
-    fn default() -> Self {
-        RafsVersion::V5
-    }
-}
-
 impl TryFrom<u32> for RafsVersion {
     type Error = Error;
 
@@ -583,20 +578,15 @@ impl RafsVersion {
 }
 
 /// Rafs metadata working mode.
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq, Default)]
 pub enum RafsMode {
     /// Directly mapping and accessing metadata into process by mmap().
+    #[default]
     Direct,
     /// Read metadata into memory before using, for RAFS v5.
     Cached,
 }
 
-impl Default for RafsMode {
-    fn default() -> Self {
-        RafsMode::Direct
-    }
-}
-
 impl FromStr for RafsMode {
     type Err = Error;
 

rust-toolchain

@@ -1 +1 @@
-1.66.1
+1.70