fix:重复打开文件出错

wdfk-prog · Rbb666 · commit 3a8be270f916 · 2025-10-25T17:32:34.000+08:00
diff --git a/dfs_lfs.c b/dfs_lfs.c
@@ -576,7 +576,6 @@ static int _dfs_lfs_open(struct dfs_file* file)
             return -ENOENT;
         }
         file->pos = 0;
-        return 0;
     }
 
     dfs_lfs = (dfs_lfs_t*)dfs->data;
@@ -691,10 +690,6 @@ static int _dfs_lfs_close(struct dfs_file* file)
     RT_ASSERT(file->data != RT_NULL);
 
     RT_ASSERT(file->vnode->ref_count > 0);
-    if (file->vnode->ref_count > 1)
-    {
-        return 0;
-    }
 
     dfs_lfs_fd = (dfs_lfs_fd_t*)file->data;
 
@@ -714,6 +709,7 @@ static int _dfs_lfs_close(struct dfs_file* file)
     }
 
     rt_free(dfs_lfs_fd);
+    file->data = RT_NULL;
 
     return _lfs_result_to_dfs(result);
 }

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,6 @@ static int _dfs_lfs_open(struct dfs_file* file)`
`576`	`576`	`return -ENOENT;`
`577`	`577`	`}`
`578`	`578`	`file->pos = 0;`
`579`		`- return 0;`
`580`	`579`	`}`
`581`	`580`
`582`	`581`	`dfs_lfs = (dfs_lfs_t*)dfs->data;`
`@@ -691,10 +690,6 @@ static int _dfs_lfs_close(struct dfs_file* file)`
`691`	`690`	`RT_ASSERT(file->data != RT_NULL);`
`692`	`691`
`693`	`692`	`RT_ASSERT(file->vnode->ref_count > 0);`
`694`		`- if (file->vnode->ref_count > 1)`
`695`		`- {`
`696`		`- return 0;`
`697`		`- }`
`698`	`693`
`699`	`694`	`dfs_lfs_fd = (dfs_lfs_fd_t*)file->data;`
`700`	`695`
`@@ -714,6 +709,7 @@ static int _dfs_lfs_close(struct dfs_file* file)`
`714`	`709`	`}`
`715`	`710`
`716`	`711`	`rt_free(dfs_lfs_fd);`
	`712`	`+ file->data = RT_NULL;`
`717`	`713`
`718`	`714`	`return _lfs_result_to_dfs(result);`
`719`	`715`	`}`