Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
65a4a1ca
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,发现更多精彩内容 >>
提交
65a4a1ca
编写于
4月 09, 2015
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
nfs: generic_write_checks() shouldn't be done on swapout...
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
7da839c4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
15 deletion
+11
-15
fs/nfs/direct.c
fs/nfs/direct.c
+3
-9
fs/nfs/file.c
fs/nfs/file.c
+7
-4
include/linux/nfs_fs.h
include/linux/nfs_fs.h
+1
-2
未找到文件。
fs/nfs/direct.c
浏览文件 @
65a4a1ca
...
...
@@ -268,7 +268,7 @@ ssize_t nfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t pos)
if
(
iov_iter_rw
(
iter
)
==
READ
)
return
nfs_file_direct_read
(
iocb
,
iter
,
pos
);
return
nfs_file_direct_write
(
iocb
,
iter
,
pos
);
return
nfs_file_direct_write
(
iocb
,
iter
);
#endif
/* CONFIG_NFS_SWAP */
}
...
...
@@ -959,8 +959,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
* Note that O_APPEND is not supported for NFS direct writes, as there
* is no atomic O_APPEND write facility in the NFS protocol.
*/
ssize_t
nfs_file_direct_write
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
iter
,
loff_t
pos
)
ssize_t
nfs_file_direct_write
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
iter
)
{
ssize_t
result
=
-
EINVAL
;
struct
file
*
file
=
iocb
->
ki_filp
;
...
...
@@ -968,15 +967,11 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
struct
inode
*
inode
=
mapping
->
host
;
struct
nfs_direct_req
*
dreq
;
struct
nfs_lock_context
*
l_ctx
;
loff_t
end
;
loff_t
pos
,
end
;
dfprintk
(
FILE
,
"NFS: direct write(%pD2, %zd@%Ld)
\n
"
,
file
,
iov_iter_count
(
iter
),
(
long
long
)
iocb
->
ki_pos
);
result
=
generic_write_checks
(
iocb
,
iter
);
if
(
result
<=
0
)
goto
out
;
nfs_add_stats
(
mapping
->
host
,
NFSIOS_DIRECTWRITTENBYTES
,
iov_iter_count
(
iter
));
...
...
@@ -1044,7 +1039,6 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter,
nfs_direct_req_release
(
dreq
);
out_unlock:
mutex_unlock
(
&
inode
->
i_mutex
);
out:
return
result
;
}
...
...
fs/nfs/file.c
浏览文件 @
65a4a1ca
...
...
@@ -674,17 +674,20 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
unsigned
long
written
=
0
;
ssize_t
result
;
size_t
count
=
iov_iter_count
(
from
);
loff_t
pos
=
iocb
->
ki_pos
;
result
=
nfs_key_timeout_notify
(
file
,
inode
);
if
(
result
)
return
result
;
if
(
iocb
->
ki_flags
&
IOCB_DIRECT
)
return
nfs_file_direct_write
(
iocb
,
from
,
pos
);
if
(
iocb
->
ki_flags
&
IOCB_DIRECT
)
{
result
=
generic_write_checks
(
iocb
,
from
);
if
(
result
<=
0
)
return
result
;
return
nfs_file_direct_write
(
iocb
,
from
);
}
dprintk
(
"NFS: write(%pD2, %zu@%Ld)
\n
"
,
file
,
count
,
(
long
long
)
pos
);
file
,
count
,
(
long
long
)
iocb
->
ki_
pos
);
result
=
-
EBUSY
;
if
(
IS_SWAPFILE
(
inode
))
...
...
include/linux/nfs_fs.h
浏览文件 @
65a4a1ca
...
...
@@ -452,8 +452,7 @@ extern ssize_t nfs_file_direct_read(struct kiocb *iocb,
struct
iov_iter
*
iter
,
loff_t
pos
);
extern
ssize_t
nfs_file_direct_write
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
iter
,
loff_t
pos
);
struct
iov_iter
*
iter
);
/*
* linux/fs/nfs/dir.c
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录