Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
3aa2d199
R
raspberrypi-kernel
项目概览
openeuler
/
raspberrypi-kernel
通知
13
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
raspberrypi-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
3aa2d199
编写于
4月 02, 2014
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
nfs: switch to ->read_iter()
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
a886038b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
14 deletion
+9
-14
fs/nfs/file.c
fs/nfs/file.c
+6
-11
fs/nfs/internal.h
fs/nfs/internal.h
+1
-1
fs/nfs/nfs4file.c
fs/nfs/nfs4file.c
+2
-2
未找到文件。
fs/nfs/file.c
浏览文件 @
3aa2d199
...
...
@@ -165,26 +165,21 @@ nfs_file_flush(struct file *file, fl_owner_t id)
EXPORT_SYMBOL_GPL
(
nfs_file_flush
);
ssize_t
nfs_file_read
(
struct
kiocb
*
iocb
,
const
struct
iovec
*
iov
,
unsigned
long
nr_segs
,
loff_t
pos
)
nfs_file_read
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
to
)
{
struct
inode
*
inode
=
file_inode
(
iocb
->
ki_filp
);
size_t
count
=
iov_length
(
iov
,
nr_segs
);
ssize_t
result
;
struct
iov_iter
to
;
iov_iter_init
(
&
to
,
READ
,
iov
,
nr_segs
,
count
);
if
(
iocb
->
ki_filp
->
f_flags
&
O_DIRECT
)
return
nfs_file_direct_read
(
iocb
,
&
to
,
pos
,
true
);
return
nfs_file_direct_read
(
iocb
,
to
,
iocb
->
ki_
pos
,
true
);
dprintk
(
"NFS: read(%pD2, %zu@%lu)
\n
"
,
iocb
->
ki_filp
,
count
,
(
unsigned
long
)
pos
);
iov_iter_count
(
to
),
(
unsigned
long
)
iocb
->
ki_
pos
);
result
=
nfs_revalidate_mapping
(
inode
,
iocb
->
ki_filp
->
f_mapping
);
if
(
!
result
)
{
result
=
generic_file_read_iter
(
iocb
,
&
to
);
result
=
generic_file_read_iter
(
iocb
,
to
);
if
(
result
>
0
)
nfs_add_stats
(
inode
,
NFSIOS_NORMALREADBYTES
,
result
);
}
...
...
@@ -945,9 +940,9 @@ EXPORT_SYMBOL_GPL(nfs_setlease);
const
struct
file_operations
nfs_file_operations
=
{
.
llseek
=
nfs_file_llseek
,
.
read
=
do
_sync_read
,
.
read
=
new
_sync_read
,
.
write
=
do_sync_write
,
.
aio_read
=
nfs_file_read
,
.
read_iter
=
nfs_file_read
,
.
aio_write
=
nfs_file_write
,
.
mmap
=
nfs_file_mmap
,
.
open
=
nfs_file_open
,
...
...
fs/nfs/internal.h
浏览文件 @
3aa2d199
...
...
@@ -320,7 +320,7 @@ int nfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *)
int
nfs_file_fsync_commit
(
struct
file
*
,
loff_t
,
loff_t
,
int
);
loff_t
nfs_file_llseek
(
struct
file
*
,
loff_t
,
int
);
int
nfs_file_flush
(
struct
file
*
,
fl_owner_t
);
ssize_t
nfs_file_read
(
struct
kiocb
*
,
const
struct
iovec
*
,
unsigned
long
,
loff_t
);
ssize_t
nfs_file_read
(
struct
kiocb
*
,
struct
iov_iter
*
);
ssize_t
nfs_file_splice_read
(
struct
file
*
,
loff_t
*
,
struct
pipe_inode_info
*
,
size_t
,
unsigned
int
);
int
nfs_file_mmap
(
struct
file
*
,
struct
vm_area_struct
*
);
...
...
fs/nfs/nfs4file.c
浏览文件 @
3aa2d199
...
...
@@ -118,9 +118,9 @@ nfs4_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
const
struct
file_operations
nfs4_file_operations
=
{
.
llseek
=
nfs_file_llseek
,
.
read
=
do
_sync_read
,
.
read
=
new
_sync_read
,
.
write
=
do_sync_write
,
.
aio_read
=
nfs_file_read
,
.
read_iter
=
nfs_file_read
,
.
aio_write
=
nfs_file_write
,
.
mmap
=
nfs_file_mmap
,
.
open
=
nfs4_file_open
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录