Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
3503e0ac
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3503e0ac
编写于
7月 06, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "ide: improve handling of Power Management requests"
This reverts commit
a1317f71
.
上级
e18ed145
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
22 deletion
+32
-22
drivers/ide/ide-io.c
drivers/ide/ide-io.c
+32
-22
未找到文件。
drivers/ide/ide-io.c
浏览文件 @
3503e0ac
...
...
@@ -466,14 +466,10 @@ void do_ide_request(struct request_queue *q)
if
(
!
ide_lock_port
(
hwif
))
{
ide_hwif_t
*
prev_port
;
WARN_ON_ONCE
(
hwif
->
rq
);
repeat:
prev_port
=
hwif
->
host
->
cur_port
;
if
(
drive
->
dev_flags
&
IDE_DFLAG_BLOCKED
)
rq
=
hwif
->
rq
;
else
WARN_ON_ONCE
(
hwif
->
rq
);
if
(
drive
->
dev_flags
&
IDE_DFLAG_SLEEPING
&&
time_after
(
drive
->
sleep
,
jiffies
))
{
ide_unlock_port
(
hwif
);
...
...
@@ -500,29 +496,43 @@ void do_ide_request(struct request_queue *q)
hwif
->
cur_dev
=
drive
;
drive
->
dev_flags
&=
~
(
IDE_DFLAG_SLEEPING
|
IDE_DFLAG_PARKED
);
if
(
rq
==
NULL
)
{
spin_unlock_irq
(
&
hwif
->
lock
);
spin_lock_irq
(
q
->
queue_lock
);
/*
* we know that the queue isn't empty, but this can
* happen if ->prep_rq_fn() decides to kill a request
*/
spin_unlock_irq
(
&
hwif
->
lock
);
spin_lock_irq
(
q
->
queue_
lock
);
/*
* we know that the queue isn't empty, but this can happen
* if the q->prep_rq_fn() decides to kill a request
*/
if
(
!
rq
)
rq
=
blk_fetch_request
(
drive
->
queue
);
spin_unlock_irq
(
q
->
queue_lock
);
spin_lock_irq
(
&
hwif
->
lock
);
if
(
rq
==
NULL
)
{
ide_unlock_port
(
hwif
);
goto
out
;
}
spin_unlock_irq
(
q
->
queue_lock
);
spin_lock_irq
(
&
hwif
->
lock
);
if
(
!
rq
)
{
ide_unlock_port
(
hwif
);
goto
out
;
}
/*
* Sanity: don't accept a request that isn't a PM request
* if we are currently power managed.
* if we are currently power managed. This is very important as
* blk_stop_queue() doesn't prevent the blk_fetch_request()
* above to return us whatever is in the queue. Since we call
* ide_do_request() ourselves, we end up taking requests while
* the queue is blocked...
*
* We let requests forced at head of queue with ide-preempt
* though. I hope that doesn't happen too much, hopefully not
* unless the subdriver triggers such a thing in its own PM
* state machine.
*/
BUG_ON
((
drive
->
dev_flags
&
IDE_DFLAG_BLOCKED
)
&&
blk_pm_request
(
rq
)
==
0
);
if
((
drive
->
dev_flags
&
IDE_DFLAG_BLOCKED
)
&&
blk_pm_request
(
rq
)
==
0
&&
(
rq
->
cmd_flags
&
REQ_PREEMPT
)
==
0
)
{
/* there should be no pending command at this point */
ide_unlock_port
(
hwif
);
goto
plug_device
;
}
hwif
->
rq
=
rq
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录