[fix][blk]解决块设备写入不对齐数据失败的问题

AngryProton · web-flow · commit 053f9bcdda2a · 2025-12-29T14:44:01.000+08:00
diff --git a/components/drivers/block/blk_dfs.c b/components/drivers/block/blk_dfs.c
@@ -175,14 +175,18 @@ static ssize_t blk_fops_write(struct dfs_file *file, const void *buf, size_t cou
     if ((count - wsize) / bytes_per_sector != 0)
     {
         res = rt_device_write(dev, blk_pos, buf + wsize, (count - wsize) / bytes_per_sector);
-        wsize += res * bytes_per_sector;
-        blk_pos += res;
 
         if (res != (count - wsize) / bytes_per_sector)
         {
+            wsize += res * bytes_per_sector;
             *pos += wsize;
             return wsize;
         }
+        else
+        {
+            wsize += res * bytes_per_sector;
+            blk_pos += res;
+        }
     }
 
     /*

Original file line number	Diff line number	Diff line change
`@@ -175,14 +175,18 @@ static ssize_t blk_fops_write(struct dfs_file file, const void buf, size_t cou`
`175`	`175`	`if ((count - wsize) / bytes_per_sector != 0)`
`176`	`176`	`{`
`177`	`177`	`res = rt_device_write(dev, blk_pos, buf + wsize, (count - wsize) / bytes_per_sector);`
`178`		`- wsize += res * bytes_per_sector;`
`179`		`- blk_pos += res;`
`180`	`178`
`181`	`179`	`if (res != (count - wsize) / bytes_per_sector)`
`182`	`180`	`{`
	`181`	`+ wsize += res * bytes_per_sector;`
`183`	`182`	`*pos += wsize;`
`184`	`183`	`return wsize;`
`185`	`184`	`}`
	`185`	`+ else`
	`186`	`+ {`
	`187`	`+ wsize += res * bytes_per_sector;`
	`188`	`+ blk_pos += res;`
	`189`	`+ }`
`186`	`190`	`}`
`187`	`191`
`188`	`192`	`/*`