Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
ee6b272b
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
158
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看板
提交
ee6b272b
编写于
6月 10, 2010
作者:
S
Sage Weil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ceph: drop unused argument
Signed-off-by:
N
Sage Weil
<
sage@newdream.net
>
上级
2962507c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
9 deletion
+6
-9
fs/ceph/caps.c
fs/ceph/caps.c
+1
-1
fs/ceph/mds_client.c
fs/ceph/mds_client.c
+4
-6
fs/ceph/mds_client.h
fs/ceph/mds_client.h
+1
-2
未找到文件。
fs/ceph/caps.c
浏览文件 @
ee6b272b
...
@@ -2717,7 +2717,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
...
@@ -2717,7 +2717,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
* along for the mds (who clearly thinks we still have this
* along for the mds (who clearly thinks we still have this
* cap).
* cap).
*/
*/
ceph_add_cap_releases
(
mdsc
,
session
,
-
1
);
ceph_add_cap_releases
(
mdsc
,
session
);
ceph_send_cap_releases
(
mdsc
,
session
);
ceph_send_cap_releases
(
mdsc
,
session
);
goto
done
;
goto
done
;
}
}
...
...
fs/ceph/mds_client.c
浏览文件 @
ee6b272b
...
@@ -1067,15 +1067,13 @@ static int trim_caps(struct ceph_mds_client *mdsc,
...
@@ -1067,15 +1067,13 @@ static int trim_caps(struct ceph_mds_client *mdsc,
* Called under s_mutex.
* Called under s_mutex.
*/
*/
int
ceph_add_cap_releases
(
struct
ceph_mds_client
*
mdsc
,
int
ceph_add_cap_releases
(
struct
ceph_mds_client
*
mdsc
,
struct
ceph_mds_session
*
session
,
struct
ceph_mds_session
*
session
)
int
extra
)
{
{
struct
ceph_msg
*
msg
;
struct
ceph_msg
*
msg
;
struct
ceph_mds_cap_release
*
head
;
struct
ceph_mds_cap_release
*
head
;
int
err
=
-
ENOMEM
;
int
err
=
-
ENOMEM
;
int
extra
=
mdsc
->
client
->
mount_args
->
cap_release_safety
;
if
(
extra
<
0
)
extra
=
mdsc
->
client
->
mount_args
->
cap_release_safety
;
spin_lock
(
&
session
->
s_cap_lock
);
spin_lock
(
&
session
->
s_cap_lock
);
...
@@ -2005,7 +2003,7 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)
...
@@ -2005,7 +2003,7 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)
}
}
mutex_unlock
(
&
mdsc
->
mutex
);
mutex_unlock
(
&
mdsc
->
mutex
);
ceph_add_cap_releases
(
mdsc
,
req
->
r_session
,
-
1
);
ceph_add_cap_releases
(
mdsc
,
req
->
r_session
);
mutex_unlock
(
&
session
->
s_mutex
);
mutex_unlock
(
&
session
->
s_mutex
);
/* kick calling process */
/* kick calling process */
...
@@ -2715,7 +2713,7 @@ static void delayed_work(struct work_struct *work)
...
@@ -2715,7 +2713,7 @@ static void delayed_work(struct work_struct *work)
send_renew_caps
(
mdsc
,
s
);
send_renew_caps
(
mdsc
,
s
);
else
else
ceph_con_keepalive
(
&
s
->
s_con
);
ceph_con_keepalive
(
&
s
->
s_con
);
ceph_add_cap_releases
(
mdsc
,
s
,
-
1
);
ceph_add_cap_releases
(
mdsc
,
s
);
if
(
s
->
s_state
==
CEPH_MDS_SESSION_OPEN
||
if
(
s
->
s_state
==
CEPH_MDS_SESSION_OPEN
||
s
->
s_state
==
CEPH_MDS_SESSION_HUNG
)
s
->
s_state
==
CEPH_MDS_SESSION_HUNG
)
ceph_send_cap_releases
(
mdsc
,
s
);
ceph_send_cap_releases
(
mdsc
,
s
);
...
...
fs/ceph/mds_client.h
浏览文件 @
ee6b272b
...
@@ -324,8 +324,7 @@ static inline void ceph_mdsc_put_request(struct ceph_mds_request *req)
...
@@ -324,8 +324,7 @@ static inline void ceph_mdsc_put_request(struct ceph_mds_request *req)
}
}
extern
int
ceph_add_cap_releases
(
struct
ceph_mds_client
*
mdsc
,
extern
int
ceph_add_cap_releases
(
struct
ceph_mds_client
*
mdsc
,
struct
ceph_mds_session
*
session
,
struct
ceph_mds_session
*
session
);
int
extra
);
extern
void
ceph_send_cap_releases
(
struct
ceph_mds_client
*
mdsc
,
extern
void
ceph_send_cap_releases
(
struct
ceph_mds_client
*
mdsc
,
struct
ceph_mds_session
*
session
);
struct
ceph_mds_session
*
session
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录