Skip to content

[fix][dfs_elm] 修复关闭目录和释放vnode时的资源泄露 #11611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Unbear-Hz wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −3
Open

[fix][dfs_elm] 修复关闭目录和释放vnode时的资源泄露 #11611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
285acec
[fix][dfs_elm] 修复关闭目录和释放vnode时的资源泄露
Unbear-Hz Jul 12, 2026
6f117d4
[chg][dfs]Clean up comments in dfs_elm_free_vnode
Unbear-Hz Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions components/dfs/dfs_v1/filesystems/elmfat/dfs_elm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ int dfs_elm_close(struct dfs_file *file)
dir = (DIR *)(file->data);
RT_ASSERT(dir != RT_NULL);

f_closedir(dir);
/* release memory */
rt_free(dir);
}
Expand Down
16 changes: 13 additions & 3 deletions components/dfs/dfs_v2/filesystems/elmfat/dfs_elm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ int dfs_elm_close(struct dfs_file *file)
dir = (DIR *)(file->vnode->data);
RT_ASSERT(dir != RT_NULL);

f_closedir(dir);
/* release memory */
rt_free(dir);
}
Expand Down Expand Up @@ -1014,10 +1015,19 @@ static struct dfs_vnode *dfs_elm_create_vnode(struct dfs_dentry *dentry, int typ

static int dfs_elm_free_vnode(struct dfs_vnode *vnode)
{
/* nothing to be freed */
if (vnode && vnode->ref_count <= 1)
if (vnode && vnode->ref_count <= 1 && vnode->data != RT_NULL)
{
vnode->data = NULL;
if (vnode->type == FT_DIRECTORY)
{
f_closedir((DIR *)vnode->data);
}
else if (vnode->type == FT_REGULAR)
{
f_close((FIL *)vnode->data);
}
rt_free(vnode->data);
vnode->data = RT_NULL;
rt_mutex_detach(&vnode->lock);
}

return 0;
Expand Down
Loading