Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
1383923d
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
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看板
提交
1383923d
编写于
12年前
作者:
J
Jens Axboe
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-jens' of
git://git.drbd.org/linux-drbd
into for-linus
上级
58c49df3
2681f7f6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
1 deletion
+9
-1
drivers/block/drbd/drbd_req.c
drivers/block/drbd/drbd_req.c
+1
-1
drivers/block/drbd/drbd_req.h
drivers/block/drbd/drbd_req.h
+1
-0
drivers/block/drbd/drbd_state.c
drivers/block/drbd/drbd_state.c
+7
-0
未找到文件。
drivers/block/drbd/drbd_req.c
浏览文件 @
1383923d
...
...
@@ -168,7 +168,7 @@ static void wake_all_senders(struct drbd_tconn *tconn) {
}
/* must hold resource->req_lock */
static
void
start_new_tl_epoch
(
struct
drbd_tconn
*
tconn
)
void
start_new_tl_epoch
(
struct
drbd_tconn
*
tconn
)
{
/* no point closing an epoch, if it is empty, anyways. */
if
(
tconn
->
current_tle_writes
==
0
)
...
...
This diff is collapsed.
Click to expand it.
drivers/block/drbd/drbd_req.h
浏览文件 @
1383923d
...
...
@@ -267,6 +267,7 @@ struct bio_and_error {
int
error
;
};
extern
void
start_new_tl_epoch
(
struct
drbd_tconn
*
tconn
);
extern
void
drbd_req_destroy
(
struct
kref
*
kref
);
extern
void
_req_may_be_done
(
struct
drbd_request
*
req
,
struct
bio_and_error
*
m
);
...
...
This diff is collapsed.
Click to expand it.
drivers/block/drbd/drbd_state.c
浏览文件 @
1383923d
...
...
@@ -931,6 +931,7 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns,
enum
drbd_state_rv
rv
=
SS_SUCCESS
;
enum
sanitize_state_warnings
ssw
;
struct
after_state_chg_work
*
ascw
;
bool
did_remote
,
should_do_remote
;
os
=
drbd_read_state
(
mdev
);
...
...
@@ -981,11 +982,17 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns,
(
os
.
disk
!=
D_DISKLESS
&&
ns
.
disk
==
D_DISKLESS
))
atomic_inc
(
&
mdev
->
local_cnt
);
did_remote
=
drbd_should_do_remote
(
mdev
->
state
);
mdev
->
state
.
i
=
ns
.
i
;
should_do_remote
=
drbd_should_do_remote
(
mdev
->
state
);
mdev
->
tconn
->
susp
=
ns
.
susp
;
mdev
->
tconn
->
susp_nod
=
ns
.
susp_nod
;
mdev
->
tconn
->
susp_fen
=
ns
.
susp_fen
;
/* put replicated vs not-replicated requests in seperate epochs */
if
(
did_remote
!=
should_do_remote
)
start_new_tl_epoch
(
mdev
->
tconn
);
if
(
os
.
disk
==
D_ATTACHING
&&
ns
.
disk
>=
D_NEGOTIATING
)
drbd_print_uuids
(
mdev
,
"attached to UUIDs"
);
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部