Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
b42353ff
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b42353ff
编写于
6月 05, 2012
作者:
T
Trond Myklebust
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
NFSv4.1: Clean up nfs4_reclaim_lease
Signed-off-by:
N
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
上级
1a47e7a6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
35 addition
and
17 deletion
+35
-17
fs/nfs/nfs4state.c
fs/nfs/nfs4state.c
+35
-17
未找到文件。
fs/nfs/nfs4state.c
浏览文件 @
b42353ff
...
...
@@ -1642,7 +1642,7 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status)
return
0
;
}
static
int
nfs4_
reclaim
_lease
(
struct
nfs_client
*
clp
)
static
int
nfs4_
establish
_lease
(
struct
nfs_client
*
clp
)
{
struct
rpc_cred
*
cred
;
const
struct
nfs4_state_recovery_ops
*
ops
=
...
...
@@ -1655,7 +1655,37 @@ static int nfs4_reclaim_lease(struct nfs_client *clp)
status
=
ops
->
establish_clid
(
clp
,
cred
);
put_rpccred
(
cred
);
if
(
status
!=
0
)
return
status
;
pnfs_destroy_all_layouts
(
clp
);
return
0
;
}
static
int
nfs4_reclaim_lease
(
struct
nfs_client
*
clp
)
{
int
status
;
status
=
nfs4_establish_lease
(
clp
);
if
(
status
<
0
)
return
nfs4_handle_reclaim_lease_error
(
clp
,
status
);
if
(
test_and_clear_bit
(
NFS4CLNT_SERVER_SCOPE_MISMATCH
,
&
clp
->
cl_state
))
nfs4_state_start_reclaim_nograce
(
clp
);
if
(
!
test_bit
(
NFS4CLNT_RECLAIM_NOGRACE
,
&
clp
->
cl_state
))
set_bit
(
NFS4CLNT_RECLAIM_REBOOT
,
&
clp
->
cl_state
);
clear_bit
(
NFS4CLNT_CHECK_LEASE
,
&
clp
->
cl_state
);
clear_bit
(
NFS4CLNT_LEASE_EXPIRED
,
&
clp
->
cl_state
);
return
0
;
}
static
int
nfs4_purge_lease
(
struct
nfs_client
*
clp
)
{
int
status
;
status
=
nfs4_establish_lease
(
clp
);
if
(
status
<
0
)
return
nfs4_handle_reclaim_lease_error
(
clp
,
status
);
clear_bit
(
NFS4CLNT_PURGE_STATE
,
&
clp
->
cl_state
);
set_bit
(
NFS4CLNT_LEASE_EXPIRED
,
&
clp
->
cl_state
);
nfs4_state_start_reclaim_nograce
(
clp
);
return
0
;
}
...
...
@@ -1868,31 +1898,19 @@ static void nfs4_state_manager(struct nfs_client *clp)
do
{
if
(
test_bit
(
NFS4CLNT_PURGE_STATE
,
&
clp
->
cl_state
))
{
section
=
"purge state"
;
status
=
nfs4_
reclaim
_lease
(
clp
);
status
=
nfs4_
purge
_lease
(
clp
);
if
(
status
<
0
)
goto
out_error
;
clear_bit
(
NFS4CLNT_PURGE_STATE
,
&
clp
->
cl_state
);
set_bit
(
NFS4CLNT_LEASE_EXPIRED
,
&
clp
->
cl_state
);
continue
;
}
if
(
test_
and_clear_
bit
(
NFS4CLNT_LEASE_EXPIRED
,
&
clp
->
cl_state
))
{
if
(
test_bit
(
NFS4CLNT_LEASE_EXPIRED
,
&
clp
->
cl_state
))
{
section
=
"lease expired"
;
/* We're going to have to re-establish a clientid */
status
=
nfs4_reclaim_lease
(
clp
);
if
(
status
<
0
)
goto
out_error
;
if
(
test_bit
(
NFS4CLNT_LEASE_EXPIRED
,
&
clp
->
cl_state
))
continue
;
clear_bit
(
NFS4CLNT_CHECK_LEASE
,
&
clp
->
cl_state
);
if
(
test_and_clear_bit
(
NFS4CLNT_SERVER_SCOPE_MISMATCH
,
&
clp
->
cl_state
))
nfs4_state_start_reclaim_nograce
(
clp
);
else
set_bit
(
NFS4CLNT_RECLAIM_REBOOT
,
&
clp
->
cl_state
);
pnfs_destroy_all_layouts
(
clp
);
continue
;
}
if
(
test_and_clear_bit
(
NFS4CLNT_CHECK_LEASE
,
&
clp
->
cl_state
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录