Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
e885de1a
cloud-kernel
项目概览
openanolis
/
cloud-kernel
12 个月 前同步成功
通知
152
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,发现更多精彩内容 >>
提交
e885de1a
编写于
6月 10, 2011
作者:
T
Trond Myklebust
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
NFSv4.1: Fall back to ordinary i/o through the mds if we have no layout segment
Signed-off-by:
N
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
上级
d8007d4d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
15 addition
and
7 deletion
+15
-7
fs/nfs/internal.h
fs/nfs/internal.h
+6
-0
fs/nfs/nfs4filelayout.c
fs/nfs/nfs4filelayout.c
+0
-2
fs/nfs/objlayout/objio_osd.c
fs/nfs/objlayout/objio_osd.c
+0
-3
fs/nfs/pnfs.c
fs/nfs/pnfs.c
+7
-0
fs/nfs/read.c
fs/nfs/read.c
+1
-1
fs/nfs/write.c
fs/nfs/write.c
+1
-1
未找到文件。
fs/nfs/internal.h
浏览文件 @
e885de1a
...
...
@@ -296,7 +296,13 @@ extern int nfs_initiate_read(struct nfs_read_data *data, struct rpc_clnt *clnt,
const
struct
rpc_call_ops
*
call_ops
);
extern
void
nfs_read_prepare
(
struct
rpc_task
*
task
,
void
*
calldata
);
struct
nfs_pageio_descriptor
;
extern
void
nfs_pageio_init_read_mds
(
struct
nfs_pageio_descriptor
*
pgio
,
struct
inode
*
inode
);
/* write.c */
extern
void
nfs_pageio_init_write_mds
(
struct
nfs_pageio_descriptor
*
pgio
,
struct
inode
*
inode
,
int
ioflags
);
extern
void
nfs_commit_free
(
struct
nfs_write_data
*
p
);
extern
int
nfs_initiate_write
(
struct
nfs_write_data
*
data
,
struct
rpc_clnt
*
clnt
,
...
...
fs/nfs/nfs4filelayout.c
浏览文件 @
e885de1a
...
...
@@ -669,8 +669,6 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
!
nfs_generic_pg_test
(
pgio
,
prev
,
req
))
return
false
;
if
(
!
pgio
->
pg_lseg
)
return
1
;
p_stripe
=
(
u64
)
prev
->
wb_index
<<
PAGE_CACHE_SHIFT
;
r_stripe
=
(
u64
)
req
->
wb_index
<<
PAGE_CACHE_SHIFT
;
stripe_unit
=
FILELAYOUT_LSEG
(
pgio
->
pg_lseg
)
->
stripe_unit
;
...
...
fs/nfs/objlayout/objio_osd.c
浏览文件 @
e885de1a
...
...
@@ -1000,9 +1000,6 @@ static bool objio_pg_test(struct nfs_pageio_descriptor *pgio,
if
(
!
pnfs_generic_pg_test
(
pgio
,
prev
,
req
))
return
false
;
if
(
pgio
->
pg_lseg
==
NULL
)
return
true
;
return
pgio
->
pg_count
+
req
->
wb_bytes
<=
OBJIO_LSEG
(
pgio
->
pg_lseg
)
->
max_io_size
;
}
...
...
fs/nfs/pnfs.c
浏览文件 @
e885de1a
...
...
@@ -1066,6 +1066,10 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *r
req
->
wb_bytes
,
IOMODE_READ
,
GFP_KERNEL
);
/* If no lseg, fall back to read through mds */
if
(
pgio
->
pg_lseg
==
NULL
)
nfs_pageio_init_read_mds
(
pgio
,
pgio
->
pg_inode
);
}
EXPORT_SYMBOL_GPL
(
pnfs_generic_pg_init_read
);
...
...
@@ -1080,6 +1084,9 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *
req
->
wb_bytes
,
IOMODE_RW
,
GFP_NOFS
);
/* If no lseg, fall back to write through mds */
if
(
pgio
->
pg_lseg
==
NULL
)
nfs_pageio_init_write_mds
(
pgio
,
pgio
->
pg_inode
,
pgio
->
pg_ioflags
);
}
EXPORT_SYMBOL_GPL
(
pnfs_generic_pg_init_write
);
...
...
fs/nfs/read.c
浏览文件 @
e885de1a
...
...
@@ -114,7 +114,7 @@ static void nfs_readpage_truncate_uninitialised_page(struct nfs_read_data *data)
}
}
static
void
nfs_pageio_init_read_mds
(
struct
nfs_pageio_descriptor
*
pgio
,
void
nfs_pageio_init_read_mds
(
struct
nfs_pageio_descriptor
*
pgio
,
struct
inode
*
inode
)
{
nfs_pageio_init
(
pgio
,
inode
,
&
nfs_pageio_read_ops
,
...
...
fs/nfs/write.c
浏览文件 @
e885de1a
...
...
@@ -1040,7 +1040,7 @@ static const struct nfs_pageio_ops nfs_pageio_write_ops = {
.
pg_doio
=
nfs_generic_pg_writepages
,
};
static
void
nfs_pageio_init_write_mds
(
struct
nfs_pageio_descriptor
*
pgio
,
void
nfs_pageio_init_write_mds
(
struct
nfs_pageio_descriptor
*
pgio
,
struct
inode
*
inode
,
int
ioflags
)
{
nfs_pageio_init
(
pgio
,
inode
,
&
nfs_pageio_write_ops
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录