diff options
Diffstat (limited to 'block/blk-timeout.c')
| -rw-r--r-- | block/blk-timeout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 22846cf3595a..bba81c9348e1 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -32,7 +32,7 @@ static int __init fail_io_timeout_debugfs(void) struct dentry *dir = fault_create_debugfs_attr("fail_io_timeout", NULL, &fail_io_timeout); - return IS_ERR(dir) ? PTR_ERR(dir) : 0; + return PTR_ERR_OR_ZERO(dir); } late_initcall(fail_io_timeout_debugfs); @@ -96,11 +96,12 @@ static void blk_rq_timed_out(struct request *req) __blk_complete_request(req); break; case BLK_EH_RESET_TIMER: - blk_clear_rq_complete(req); if (q->mq_ops) blk_mq_add_timer(req); else blk_add_timer(req); + + blk_clear_rq_complete(req); break; case BLK_EH_NOT_HANDLED: /* @@ -178,7 +179,6 @@ void __blk_add_timer(struct request *req, struct list_head *timeout_list) return; BUG_ON(!list_empty(&req->timeout_list)); - BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags)); /* * Some LLDs, like scsi, peek at the timeout to prevent a |