liujingx 10 mēneši atpakaļ
vecāks
revīzija
df04db499c
2 mainītis faili ar 3 papildinājumiem un 5 dzēšanām
  1. 3 3
      src/ext4/mod.rs
  2. 0 2
      src/ext4_defs/xattr.rs

+ 3 - 3
src/ext4/mod.rs

@@ -24,19 +24,19 @@ impl Ext4 {
         // TODO: if the main superblock is corrupted, should we load the backup?
         let block = block_device.read_block(0);
         let sb = block.read_offset_as::<SuperBlock>(BASE_OFFSET);
+        log::debug!("Ext4 loaded: {:?}", sb);
         // Check magic number
         if !sb.check_magic() {
             return_error!(ErrCode::EINVAL, "Invalid magic number");
         }
         // Check inode size
-        if !sb.inode_size() == SB_GOOD_INODE_SIZE {
+        if sb.inode_size() != SB_GOOD_INODE_SIZE {
             return_error!(ErrCode::EINVAL, "Invalid inode size");
         }
         // Check block group desc size
-        if !sb.desc_size() as usize != SB_GOOD_DESC_SIZE {
+        if sb.desc_size() as usize != SB_GOOD_DESC_SIZE {
             return_error!(ErrCode::EINVAL, "Invalid block group desc size");
         }
-        log::debug!("Ext4 loaded: {:?}", sb);
         // Create Ext4 instance
         Ok(Self { block_device })
     }

+ 0 - 2
src/ext4_defs/xattr.rs

@@ -272,8 +272,6 @@ impl XattrBlock {
             entry_start += next_entry.used_size();
         }
         // Clear [entry_offset, value_offset)
-        trace!("Clearing [{}, {})", entry_start, value_end);
-        assert!(entry_start < value_end);
         self.0.data[entry_start..value_end].fill(0);
         true
     }