Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
18c67cb9
K
Kernel
项目概览
openeuler
/
Kernel
大约 1 年 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
18c67cb9
编写于
6月 19, 2013
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
splice: lift checks from do_splice_from() into callers
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
68d70d03
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
11 deletion
+20
-11
fs/splice.c
fs/splice.c
+20
-11
未找到文件。
fs/splice.c
浏览文件 @
18c67cb9
...
@@ -1098,17 +1098,6 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
...
@@ -1098,17 +1098,6 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
{
{
ssize_t
(
*
splice_write
)(
struct
pipe_inode_info
*
,
struct
file
*
,
ssize_t
(
*
splice_write
)(
struct
pipe_inode_info
*
,
struct
file
*
,
loff_t
*
,
size_t
,
unsigned
int
);
loff_t
*
,
size_t
,
unsigned
int
);
int
ret
;
if
(
unlikely
(
!
(
out
->
f_mode
&
FMODE_WRITE
)))
return
-
EBADF
;
if
(
unlikely
(
out
->
f_flags
&
O_APPEND
))
return
-
EINVAL
;
ret
=
rw_verify_area
(
WRITE
,
out
,
ppos
,
len
);
if
(
unlikely
(
ret
<
0
))
return
ret
;
if
(
out
->
f_op
&&
out
->
f_op
->
splice_write
)
if
(
out
->
f_op
&&
out
->
f_op
->
splice_write
)
splice_write
=
out
->
f_op
->
splice_write
;
splice_write
=
out
->
f_op
->
splice_write
;
...
@@ -1303,6 +1292,16 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
...
@@ -1303,6 +1292,16 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
};
};
long
ret
;
long
ret
;
if
(
unlikely
(
!
(
out
->
f_mode
&
FMODE_WRITE
)))
return
-
EBADF
;
if
(
unlikely
(
out
->
f_flags
&
O_APPEND
))
return
-
EINVAL
;
ret
=
rw_verify_area
(
WRITE
,
out
,
opos
,
len
);
if
(
unlikely
(
ret
<
0
))
return
ret
;
ret
=
splice_direct_to_actor
(
in
,
&
sd
,
direct_splice_actor
);
ret
=
splice_direct_to_actor
(
in
,
&
sd
,
direct_splice_actor
);
if
(
ret
>
0
)
if
(
ret
>
0
)
*
ppos
=
sd
.
pos
;
*
ppos
=
sd
.
pos
;
...
@@ -1358,6 +1357,16 @@ static long do_splice(struct file *in, loff_t __user *off_in,
...
@@ -1358,6 +1357,16 @@ static long do_splice(struct file *in, loff_t __user *off_in,
offset
=
out
->
f_pos
;
offset
=
out
->
f_pos
;
}
}
if
(
unlikely
(
!
(
out
->
f_mode
&
FMODE_WRITE
)))
return
-
EBADF
;
if
(
unlikely
(
out
->
f_flags
&
O_APPEND
))
return
-
EINVAL
;
ret
=
rw_verify_area
(
WRITE
,
out
,
&
offset
,
len
);
if
(
unlikely
(
ret
<
0
))
return
ret
;
file_start_write
(
out
);
file_start_write
(
out
);
ret
=
do_splice_from
(
ipipe
,
out
,
&
offset
,
len
,
flags
);
ret
=
do_splice_from
(
ipipe
,
out
,
&
offset
,
len
,
flags
);
file_end_write
(
out
);
file_end_write
(
out
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录