Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
6a534149
R
rt-thread
项目概览
BaiXuePrincess
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6a534149
编写于
12月 15, 2017
作者:
B
Bernard Xiong
提交者:
GitHub
12月 15, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1111 from SummerGGift/nfs_fix
[dfs]:fix bug in nfs caused by struct dfs_fd
上级
f260fddf
d051c6de
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
9 deletion
+14
-9
components/dfs/filesystems/nfs/dfs_nfs.c
components/dfs/filesystems/nfs/dfs_nfs.c
+14
-9
未找到文件。
components/dfs/filesystems/nfs/dfs_nfs.c
浏览文件 @
6a534149
...
@@ -578,7 +578,8 @@ int nfs_read(struct dfs_fd *file, void *buf, size_t count)
...
@@ -578,7 +578,8 @@ int nfs_read(struct dfs_fd *file, void *buf, size_t count)
RT_ASSERT
(
file
->
data
!=
NULL
);
RT_ASSERT
(
file
->
data
!=
NULL
);
nfs
=
(
nfs_filesystem
*
)((
struct
dfs_filesystem
*
)(
file
->
data
));
struct
dfs_filesystem
*
dfs_nfs
=
((
struct
dfs_filesystem
*
)(
file
->
data
));
nfs
=
(
struct
nfs_filesystem
*
)(
dfs_nfs
->
data
);
fd
=
(
nfs_file
*
)(
nfs
->
data
);
fd
=
(
nfs_file
*
)(
nfs
->
data
);
RT_ASSERT
(
fd
!=
NULL
);
RT_ASSERT
(
fd
!=
NULL
);
...
@@ -644,7 +645,8 @@ int nfs_write(struct dfs_fd *file, const void *buf, size_t count)
...
@@ -644,7 +645,8 @@ int nfs_write(struct dfs_fd *file, const void *buf, size_t count)
return
-
EISDIR
;
return
-
EISDIR
;
RT_ASSERT
(
file
->
data
!=
NULL
);
RT_ASSERT
(
file
->
data
!=
NULL
);
nfs
=
(
nfs_filesystem
*
)((
struct
dfs_filesystem
*
)(
file
->
data
));
struct
dfs_filesystem
*
dfs_nfs
=
((
struct
dfs_filesystem
*
)(
file
->
data
));
nfs
=
(
struct
nfs_filesystem
*
)(
dfs_nfs
->
data
);
fd
=
(
nfs_file
*
)(
nfs
->
data
);
fd
=
(
nfs_file
*
)(
nfs
->
data
);
RT_ASSERT
(
fd
!=
NULL
);
RT_ASSERT
(
fd
!=
NULL
);
...
@@ -684,8 +686,8 @@ int nfs_write(struct dfs_fd *file, const void *buf, size_t count)
...
@@ -684,8 +686,8 @@ int nfs_write(struct dfs_fd *file, const void *buf, size_t count)
/* update current position */
/* update current position */
file
->
pos
=
fd
->
offset
;
file
->
pos
=
fd
->
offset
;
/* update file size */
/* update file size */
if
(
fd
->
size
<
fd
->
offset
)
fd
->
size
=
fd
->
offset
;
if
(
fd
->
size
<
fd
->
offset
)
fd
->
size
=
fd
->
offset
;
file
->
size
=
fd
->
size
;
file
->
size
=
fd
->
size
;
}
}
xdr_free
((
xdrproc_t
)
xdr_WRITE3res
,
(
char
*
)
&
res
);
xdr_free
((
xdrproc_t
)
xdr_WRITE3res
,
(
char
*
)
&
res
);
}
while
(
count
>
0
);
}
while
(
count
>
0
);
...
@@ -704,7 +706,8 @@ int nfs_lseek(struct dfs_fd *file, off_t offset)
...
@@ -704,7 +706,8 @@ int nfs_lseek(struct dfs_fd *file, off_t offset)
return
-
EISDIR
;
return
-
EISDIR
;
RT_ASSERT
(
file
->
data
!=
NULL
);
RT_ASSERT
(
file
->
data
!=
NULL
);
nfs
=
(
nfs_filesystem
*
)((
struct
dfs_filesystem
*
)(
file
->
data
));
struct
dfs_filesystem
*
dfs_nfs
=
((
struct
dfs_filesystem
*
)(
file
->
data
));
nfs
=
(
struct
nfs_filesystem
*
)(
dfs_nfs
->
data
);
fd
=
(
nfs_file
*
)(
nfs
->
data
);
fd
=
(
nfs_file
*
)(
nfs
->
data
);
RT_ASSERT
(
fd
!=
NULL
);
RT_ASSERT
(
fd
!=
NULL
);
...
@@ -722,7 +725,8 @@ int nfs_close(struct dfs_fd *file)
...
@@ -722,7 +725,8 @@ int nfs_close(struct dfs_fd *file)
{
{
nfs_filesystem
*
nfs
;
nfs_filesystem
*
nfs
;
RT_ASSERT
(
file
->
data
!=
NULL
);
RT_ASSERT
(
file
->
data
!=
NULL
);
nfs
=
(
nfs_filesystem
*
)((
struct
dfs_filesystem
*
)(
file
->
data
));
struct
dfs_filesystem
*
dfs_nfs
=
((
struct
dfs_filesystem
*
)(
file
->
data
));
nfs
=
(
struct
nfs_filesystem
*
)(
dfs_nfs
->
data
);
if
(
file
->
type
==
FT_DIRECTORY
)
if
(
file
->
type
==
FT_DIRECTORY
)
{
{
...
@@ -751,7 +755,8 @@ int nfs_open(struct dfs_fd *file)
...
@@ -751,7 +755,8 @@ int nfs_open(struct dfs_fd *file)
{
{
nfs_filesystem
*
nfs
;
nfs_filesystem
*
nfs
;
RT_ASSERT
(
file
->
data
!=
NULL
);
RT_ASSERT
(
file
->
data
!=
NULL
);
nfs
=
(
nfs_filesystem
*
)((
struct
dfs_filesystem
*
)(
file
->
data
));
struct
dfs_filesystem
*
dfs_nfs
=
((
struct
dfs_filesystem
*
)(
file
->
data
));
nfs
=
(
struct
nfs_filesystem
*
)(
dfs_nfs
->
data
);
if
(
file
->
flags
&
O_DIRECTORY
)
if
(
file
->
flags
&
O_DIRECTORY
)
...
@@ -883,7 +888,6 @@ nfs_dir *nfs_opendir(nfs_filesystem *nfs, const char *path)
...
@@ -883,7 +888,6 @@ nfs_dir *nfs_opendir(nfs_filesystem *nfs, const char *path)
if
(
handle
==
NULL
)
if
(
handle
==
NULL
)
{
{
rt_free
(
dir
);
rt_free
(
dir
);
return
NULL
;
return
NULL
;
}
}
...
@@ -1093,7 +1097,8 @@ int nfs_getdents(struct dfs_fd *file, struct dirent *dirp, uint32_t count)
...
@@ -1093,7 +1097,8 @@ int nfs_getdents(struct dfs_fd *file, struct dirent *dirp, uint32_t count)
RT_ASSERT
(
file
->
data
!=
NULL
);
RT_ASSERT
(
file
->
data
!=
NULL
);
nfs
=
(
nfs_filesystem
*
)((
struct
dfs_filesystem
*
)(
file
->
data
));
struct
dfs_filesystem
*
dfs_nfs
=
((
struct
dfs_filesystem
*
)(
file
->
data
));
nfs
=
(
struct
nfs_filesystem
*
)(
dfs_nfs
->
data
);
dir
=
(
nfs_dir
*
)(
nfs
->
data
);
dir
=
(
nfs_dir
*
)(
nfs
->
data
);
RT_ASSERT
(
dir
!=
NULL
);
RT_ASSERT
(
dir
!=
NULL
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录