Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
bc5a89b3
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
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,发现更多精彩内容 >>
提交
bc5a89b3
编写于
10月 15, 2012
作者:
T
Trond Myklebust
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
NFSv4.1: Remove assertion BUG_ON()s from the files and generic layout code
Signed-off-by:
N
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
上级
eba24e1f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
15 deletion
+6
-15
fs/nfs/nfs4filelayout.c
fs/nfs/nfs4filelayout.c
+4
-9
fs/nfs/nfs4filelayoutdev.c
fs/nfs/nfs4filelayoutdev.c
+0
-2
fs/nfs/pnfs.c
fs/nfs/pnfs.c
+2
-4
未找到文件。
fs/nfs/nfs4filelayout.c
浏览文件 @
bc5a89b3
...
...
@@ -512,7 +512,6 @@ filelayout_read_pagelist(struct nfs_read_data *data)
loff_t
offset
=
data
->
args
.
offset
;
u32
j
,
idx
;
struct
nfs_fh
*
fh
;
int
status
;
dprintk
(
"--> %s ino %lu pgbase %u req %Zu@%llu
\n
"
,
__func__
,
hdr
->
inode
->
i_ino
,
...
...
@@ -538,9 +537,8 @@ filelayout_read_pagelist(struct nfs_read_data *data)
data
->
mds_offset
=
offset
;
/* Perform an asynchronous read to ds */
status
=
nfs_initiate_read
(
ds
->
ds_clp
->
cl_rpcclient
,
data
,
nfs_initiate_read
(
ds
->
ds_clp
->
cl_rpcclient
,
data
,
&
filelayout_read_call_ops
,
RPC_TASK_SOFTCONN
);
BUG_ON
(
status
!=
0
);
return
PNFS_ATTEMPTED
;
}
...
...
@@ -554,7 +552,6 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync)
loff_t
offset
=
data
->
args
.
offset
;
u32
j
,
idx
;
struct
nfs_fh
*
fh
;
int
status
;
/* Retrieve the correct rpc_client for the byte range */
j
=
nfs4_fl_calc_j_index
(
lseg
,
offset
);
...
...
@@ -579,10 +576,9 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync)
data
->
args
.
offset
=
filelayout_get_dserver_offset
(
lseg
,
offset
);
/* Perform an asynchronous write */
status
=
nfs_initiate_write
(
ds
->
ds_clp
->
cl_rpcclient
,
data
,
nfs_initiate_write
(
ds
->
ds_clp
->
cl_rpcclient
,
data
,
&
filelayout_write_call_ops
,
sync
,
RPC_TASK_SOFTCONN
);
BUG_ON
(
status
!=
0
);
return
PNFS_ATTEMPTED
;
}
...
...
@@ -909,7 +905,7 @@ static void
filelayout_pg_init_read
(
struct
nfs_pageio_descriptor
*
pgio
,
struct
nfs_page
*
req
)
{
BUG_ON
(
pgio
->
pg_lseg
!=
NULL
);
WARN_ON_ONCE
(
pgio
->
pg_lseg
!=
NULL
);
if
(
req
->
wb_offset
!=
req
->
wb_pgbase
)
{
/*
...
...
@@ -939,7 +935,7 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio,
struct
nfs_commit_info
cinfo
;
int
status
;
BUG_ON
(
pgio
->
pg_lseg
!=
NULL
);
WARN_ON_ONCE
(
pgio
->
pg_lseg
!=
NULL
);
if
(
req
->
wb_offset
!=
req
->
wb_pgbase
)
goto
out_mds
;
...
...
@@ -1187,7 +1183,6 @@ static void filelayout_recover_commit_reqs(struct list_head *dst,
*/
for
(
i
=
0
,
b
=
cinfo
->
ds
->
buckets
;
i
<
cinfo
->
ds
->
nbuckets
;
i
++
,
b
++
)
{
if
(
transfer_commit_list
(
&
b
->
written
,
dst
,
cinfo
,
0
))
{
BUG_ON
(
!
list_empty
(
&
b
->
written
));
pnfs_put_lseg
(
b
->
wlseg
);
b
->
wlseg
=
NULL
;
}
...
...
fs/nfs/nfs4filelayoutdev.c
浏览文件 @
bc5a89b3
...
...
@@ -162,8 +162,6 @@ nfs4_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds)
dprintk
(
"--> %s DS %s au_flavor %d
\n
"
,
__func__
,
ds
->
ds_remotestr
,
mds_srv
->
nfs_client
->
cl_rpcclient
->
cl_auth
->
au_flavor
);
BUG_ON
(
list_empty
(
&
ds
->
ds_addrs
));
list_for_each_entry
(
da
,
&
ds
->
ds_addrs
,
da_node
)
{
dprintk
(
"%s: DS %s: trying address %s
\n
"
,
__func__
,
ds
->
ds_remotestr
,
da
->
da_remotestr
);
...
...
fs/nfs/pnfs.c
浏览文件 @
bc5a89b3
...
...
@@ -634,7 +634,6 @@ send_layoutget(struct pnfs_layout_hdr *lo,
dprintk
(
"--> %s
\n
"
,
__func__
);
BUG_ON
(
ctx
==
NULL
);
lgp
=
kzalloc
(
sizeof
(
*
lgp
),
gfp_flags
);
if
(
lgp
==
NULL
)
return
NULL
;
...
...
@@ -1115,7 +1114,6 @@ pnfs_update_layout(struct inode *ino,
* chance of a CB_LAYOUTRECALL(FILE) coming in.
*/
spin_lock
(
&
clp
->
cl_lock
);
BUG_ON
(
!
list_empty
(
&
lo
->
plh_layouts
));
list_add_tail
(
&
lo
->
plh_layouts
,
&
server
->
layouts
);
spin_unlock
(
&
clp
->
cl_lock
);
}
...
...
@@ -1211,7 +1209,7 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *r
{
u64
rd_size
=
req
->
wb_bytes
;
BUG_ON
(
pgio
->
pg_lseg
!=
NULL
);
WARN_ON_ONCE
(
pgio
->
pg_lseg
!=
NULL
);
if
(
req
->
wb_offset
!=
req
->
wb_pgbase
)
{
nfs_pageio_reset_read_mds
(
pgio
);
...
...
@@ -1240,7 +1238,7 @@ void
pnfs_generic_pg_init_write
(
struct
nfs_pageio_descriptor
*
pgio
,
struct
nfs_page
*
req
,
u64
wb_size
)
{
BUG_ON
(
pgio
->
pg_lseg
!=
NULL
);
WARN_ON_ONCE
(
pgio
->
pg_lseg
!=
NULL
);
if
(
req
->
wb_offset
!=
req
->
wb_pgbase
)
{
nfs_pageio_reset_write_mds
(
pgio
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录