Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
5faf153e
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
158
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5faf153e
编写于
6月 15, 2013
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
don't call file_pos_write() if vfs_{read,write}{,v}() fails
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
13f8e981
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
6 deletion
+12
-6
fs/read_write.c
fs/read_write.c
+12
-6
未找到文件。
fs/read_write.c
浏览文件 @
5faf153e
...
@@ -477,7 +477,8 @@ SYSCALL_DEFINE3(read, unsigned int, fd, char __user *, buf, size_t, count)
...
@@ -477,7 +477,8 @@ SYSCALL_DEFINE3(read, unsigned int, fd, char __user *, buf, size_t, count)
if
(
f
.
file
)
{
if
(
f
.
file
)
{
loff_t
pos
=
file_pos_read
(
f
.
file
);
loff_t
pos
=
file_pos_read
(
f
.
file
);
ret
=
vfs_read
(
f
.
file
,
buf
,
count
,
&
pos
);
ret
=
vfs_read
(
f
.
file
,
buf
,
count
,
&
pos
);
file_pos_write
(
f
.
file
,
pos
);
if
(
ret
>=
0
)
file_pos_write
(
f
.
file
,
pos
);
fdput
(
f
);
fdput
(
f
);
}
}
return
ret
;
return
ret
;
...
@@ -492,7 +493,8 @@ SYSCALL_DEFINE3(write, unsigned int, fd, const char __user *, buf,
...
@@ -492,7 +493,8 @@ SYSCALL_DEFINE3(write, unsigned int, fd, const char __user *, buf,
if
(
f
.
file
)
{
if
(
f
.
file
)
{
loff_t
pos
=
file_pos_read
(
f
.
file
);
loff_t
pos
=
file_pos_read
(
f
.
file
);
ret
=
vfs_write
(
f
.
file
,
buf
,
count
,
&
pos
);
ret
=
vfs_write
(
f
.
file
,
buf
,
count
,
&
pos
);
file_pos_write
(
f
.
file
,
pos
);
if
(
ret
>=
0
)
file_pos_write
(
f
.
file
,
pos
);
fdput
(
f
);
fdput
(
f
);
}
}
...
@@ -780,7 +782,8 @@ SYSCALL_DEFINE3(readv, unsigned long, fd, const struct iovec __user *, vec,
...
@@ -780,7 +782,8 @@ SYSCALL_DEFINE3(readv, unsigned long, fd, const struct iovec __user *, vec,
if
(
f
.
file
)
{
if
(
f
.
file
)
{
loff_t
pos
=
file_pos_read
(
f
.
file
);
loff_t
pos
=
file_pos_read
(
f
.
file
);
ret
=
vfs_readv
(
f
.
file
,
vec
,
vlen
,
&
pos
);
ret
=
vfs_readv
(
f
.
file
,
vec
,
vlen
,
&
pos
);
file_pos_write
(
f
.
file
,
pos
);
if
(
ret
>=
0
)
file_pos_write
(
f
.
file
,
pos
);
fdput
(
f
);
fdput
(
f
);
}
}
...
@@ -799,7 +802,8 @@ SYSCALL_DEFINE3(writev, unsigned long, fd, const struct iovec __user *, vec,
...
@@ -799,7 +802,8 @@ SYSCALL_DEFINE3(writev, unsigned long, fd, const struct iovec __user *, vec,
if
(
f
.
file
)
{
if
(
f
.
file
)
{
loff_t
pos
=
file_pos_read
(
f
.
file
);
loff_t
pos
=
file_pos_read
(
f
.
file
);
ret
=
vfs_writev
(
f
.
file
,
vec
,
vlen
,
&
pos
);
ret
=
vfs_writev
(
f
.
file
,
vec
,
vlen
,
&
pos
);
file_pos_write
(
f
.
file
,
pos
);
if
(
ret
>=
0
)
file_pos_write
(
f
.
file
,
pos
);
fdput
(
f
);
fdput
(
f
);
}
}
...
@@ -959,7 +963,8 @@ COMPAT_SYSCALL_DEFINE3(readv, unsigned long, fd,
...
@@ -959,7 +963,8 @@ COMPAT_SYSCALL_DEFINE3(readv, unsigned long, fd,
return
-
EBADF
;
return
-
EBADF
;
pos
=
f
.
file
->
f_pos
;
pos
=
f
.
file
->
f_pos
;
ret
=
compat_readv
(
f
.
file
,
vec
,
vlen
,
&
pos
);
ret
=
compat_readv
(
f
.
file
,
vec
,
vlen
,
&
pos
);
f
.
file
->
f_pos
=
pos
;
if
(
ret
>=
0
)
f
.
file
->
f_pos
=
pos
;
fdput
(
f
);
fdput
(
f
);
return
ret
;
return
ret
;
}
}
...
@@ -1025,7 +1030,8 @@ COMPAT_SYSCALL_DEFINE3(writev, unsigned long, fd,
...
@@ -1025,7 +1030,8 @@ COMPAT_SYSCALL_DEFINE3(writev, unsigned long, fd,
return
-
EBADF
;
return
-
EBADF
;
pos
=
f
.
file
->
f_pos
;
pos
=
f
.
file
->
f_pos
;
ret
=
compat_writev
(
f
.
file
,
vec
,
vlen
,
&
pos
);
ret
=
compat_writev
(
f
.
file
,
vec
,
vlen
,
&
pos
);
f
.
file
->
f_pos
=
pos
;
if
(
ret
>=
0
)
f
.
file
->
f_pos
=
pos
;
fdput
(
f
);
fdput
(
f
);
return
ret
;
return
ret
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录