Skip to content

fix dfs_file_open error code #7942

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
BernardXiong merged 1 commit into from
Aug 12, 2023
Merged

fix dfs_file_open error code #7942

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
11 changes: 8 additions & 3 deletions components/dfs/dfs_v2/src/dfs_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,8 @@ int dfs_file_open(struct dfs_file *file, const char *path, int oflags, mode_t mo
oflags &= ~O_EXCL;
/* the dentry already exists */
dfs_dentry_unref(dentry);
dentry = RT_NULL;
ret = -EEXIST;
goto _ERR_RET;
}
}
else
Expand Down Expand Up @@ -536,6 +537,7 @@ int dfs_file_open(struct dfs_file *file, const char *path, int oflags, mode_t mo
{
DLOG(msg, "dfs_file", mnt->fs_ops->name, DLOG_MSG, "no permission or fops->open");
dfs_file_unref(file);
ret = -EPERM;
}
}
else
Expand All @@ -544,8 +546,6 @@ int dfs_file_open(struct dfs_file *file, const char *path, int oflags, mode_t mo
ret = -ENOENT;
}
}

rt_free(fullpath);
}

if (ret >= 0 && (oflags & O_TRUNC))
Expand Down Expand Up @@ -584,6 +584,11 @@ int dfs_file_open(struct dfs_file *file, const char *path, int oflags, mode_t mo
}
}

_ERR_RET:
if (fullpath != NULL)
{
rt_free(fullpath);
}
return ret;
}

Expand Down