Skip to content

[DFS_V1] 修复close失败后不释放fd导致内存被永久占用且无法释放 #7907

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

Merged
merged 1 commit into from
Aug 3, 2023
Merged

[DFS_V1] 修复close失败后不释放fd导致内存被永久占用且无法释放 #7907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 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 @@ -491,11 +491,9 @@ int dfs_elm_close(struct dfs_file *file)
RT_ASSERT(fd != RT_NULL);

result = f_close(fd);
if (result == FR_OK)
{
/* release memory */
rt_free(fd);
}

/* release memory */
rt_free(fd);
}

return elm_result_to_dfs(result);
Expand Down
7 changes: 0 additions & 7 deletions components/dfs/dfs_v1/src/dfs_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,6 @@ int dfs_file_close(struct dfs_file *fd)
result = vnode->fops->close(fd);
}

/* close fd error, return */
if (result < 0)
{
dfs_fm_unlock();
return result;
}

if (vnode->ref_count == 1)
{
/* remove from hash */
Expand Down
3 changes: 1 addition & 2 deletions components/dfs/dfs_v1/src/dfs_posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ int close(int fd)
}

result = dfs_file_close(d);
fd_release(fd);

if (result < 0)
{
Expand All @@ -154,8 +155,6 @@ int close(int fd)
return -1;
}

fd_release(fd);

return 0;
}
RTM_EXPORT(close);
Expand Down