Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FengXiao2002
Linux Imx
提交
6d407cfa
L
Linux Imx
项目概览
FengXiao2002
/
Linux Imx
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
Linux Imx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6d407cfa
编写于
6月 13, 2012
作者:
J
Jens Axboe
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-jens' of
git://git.drbd.org/linux-drbd
into for-linus
上级
98775171
0d5934e3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
51 addition
and
26 deletion
+51
-26
drivers/block/drbd/drbd_bitmap.c
drivers/block/drbd/drbd_bitmap.c
+9
-2
drivers/block/drbd/drbd_req.c
drivers/block/drbd/drbd_req.c
+42
-24
未找到文件。
drivers/block/drbd/drbd_bitmap.c
浏览文件 @
6d407cfa
...
...
@@ -1475,10 +1475,17 @@ void _drbd_bm_set_bits(struct drbd_conf *mdev, const unsigned long s, const unsi
first_word
=
0
;
spin_lock_irq
(
&
b
->
bm_lock
);
}
/* last page (respectively only page, for first page == last page) */
last_word
=
MLPP
(
el
>>
LN2_BPL
);
bm_set_full_words_within_one_page
(
mdev
->
bitmap
,
last_page
,
first_word
,
last_word
);
/* consider bitmap->bm_bits = 32768, bitmap->bm_number_of_pages = 1. (or multiples).
* ==> e = 32767, el = 32768, last_page = 2,
* and now last_word = 0.
* We do not want to touch last_page in this case,
* as we did not allocate it, it is not present in bitmap->bm_pages.
*/
if
(
last_word
)
bm_set_full_words_within_one_page
(
mdev
->
bitmap
,
last_page
,
first_word
,
last_word
);
/* possibly trailing bits.
* example: (e & 63) == 63, el will be e+1.
...
...
drivers/block/drbd/drbd_req.c
浏览文件 @
6d407cfa
...
...
@@ -472,12 +472,17 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
req
->
rq_state
|=
RQ_LOCAL_COMPLETED
;
req
->
rq_state
&=
~
RQ_LOCAL_PENDING
;
D_ASSERT
(
!
(
req
->
rq_state
&
RQ_NET_MASK
));
if
(
req
->
rq_state
&
RQ_LOCAL_ABORTED
)
{
_req_may_be_done
(
req
,
m
);
break
;
}
__drbd_chk_io_error
(
mdev
,
false
);
goto_queue_for_net_read:
D_ASSERT
(
!
(
req
->
rq_state
&
RQ_NET_MASK
));
/* no point in retrying if there is no good remote data,
* or we have no connection. */
if
(
mdev
->
state
.
pdsk
!=
D_UP_TO_DATE
)
{
...
...
@@ -765,6 +770,40 @@ static int drbd_may_do_local_read(struct drbd_conf *mdev, sector_t sector, int s
return
0
==
drbd_bm_count_bits
(
mdev
,
sbnr
,
ebnr
);
}
static
void
maybe_pull_ahead
(
struct
drbd_conf
*
mdev
)
{
int
congested
=
0
;
/* If I don't even have good local storage, we can not reasonably try
* to pull ahead of the peer. We also need the local reference to make
* sure mdev->act_log is there.
* Note: caller has to make sure that net_conf is there.
*/
if
(
!
get_ldev_if_state
(
mdev
,
D_UP_TO_DATE
))
return
;
if
(
mdev
->
net_conf
->
cong_fill
&&
atomic_read
(
&
mdev
->
ap_in_flight
)
>=
mdev
->
net_conf
->
cong_fill
)
{
dev_info
(
DEV
,
"Congestion-fill threshold reached
\n
"
);
congested
=
1
;
}
if
(
mdev
->
act_log
->
used
>=
mdev
->
net_conf
->
cong_extents
)
{
dev_info
(
DEV
,
"Congestion-extents threshold reached
\n
"
);
congested
=
1
;
}
if
(
congested
)
{
queue_barrier
(
mdev
);
/* last barrier, after mirrored writes */
if
(
mdev
->
net_conf
->
on_congestion
==
OC_PULL_AHEAD
)
_drbd_set_state
(
_NS
(
mdev
,
conn
,
C_AHEAD
),
0
,
NULL
);
else
/*mdev->net_conf->on_congestion == OC_DISCONNECT */
_drbd_set_state
(
_NS
(
mdev
,
conn
,
C_DISCONNECTING
),
0
,
NULL
);
}
put_ldev
(
mdev
);
}
static
int
drbd_make_request_common
(
struct
drbd_conf
*
mdev
,
struct
bio
*
bio
,
unsigned
long
start_time
)
{
const
int
rw
=
bio_rw
(
bio
);
...
...
@@ -972,29 +1011,8 @@ allocate_barrier:
_req_mod
(
req
,
queue_for_send_oos
);
if
(
remote
&&
mdev
->
net_conf
->
on_congestion
!=
OC_BLOCK
&&
mdev
->
agreed_pro_version
>=
96
)
{
int
congested
=
0
;
if
(
mdev
->
net_conf
->
cong_fill
&&
atomic_read
(
&
mdev
->
ap_in_flight
)
>=
mdev
->
net_conf
->
cong_fill
)
{
dev_info
(
DEV
,
"Congestion-fill threshold reached
\n
"
);
congested
=
1
;
}
if
(
mdev
->
act_log
->
used
>=
mdev
->
net_conf
->
cong_extents
)
{
dev_info
(
DEV
,
"Congestion-extents threshold reached
\n
"
);
congested
=
1
;
}
if
(
congested
)
{
queue_barrier
(
mdev
);
/* last barrier, after mirrored writes */
if
(
mdev
->
net_conf
->
on_congestion
==
OC_PULL_AHEAD
)
_drbd_set_state
(
_NS
(
mdev
,
conn
,
C_AHEAD
),
0
,
NULL
);
else
/*mdev->net_conf->on_congestion == OC_DISCONNECT */
_drbd_set_state
(
_NS
(
mdev
,
conn
,
C_DISCONNECTING
),
0
,
NULL
);
}
}
mdev
->
net_conf
->
on_congestion
!=
OC_BLOCK
&&
mdev
->
agreed_pro_version
>=
96
)
maybe_pull_ahead
(
mdev
);
spin_unlock_irq
(
&
mdev
->
req_lock
);
kfree
(
b
);
/* if someone else has beaten us to it... */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录