diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-16 01:07:18 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-16 01:07:18 +0100 |
| commit | 97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c (patch) | |
| tree | a71115af6c30fdc9de0878e2cf1c51e95b17a324 /block/blk-timeout.c | |
| parent | Input: ALPS - move v7 packet info to Documentation and v6 packet info (diff) | |
| parent | Input: bfin_rotary - introduce open and close methods (diff) | |
| download | linux-97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c.tar.xz linux-97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c.zip | |
Merge branch 'bfin_rotary' into next
Merge bfin_rotary driver changes from Sonic Zhang.
Diffstat (limited to 'block/blk-timeout.c')
| -rw-r--r-- | block/blk-timeout.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 56c025894cdf..246dfb16c3d9 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -190,6 +190,9 @@ void blk_add_timer(struct request *req) struct request_queue *q = req->q; unsigned long expiry; + if (req->cmd_flags & REQ_NO_TIMEOUT) + return; + /* blk-mq has its own handler, so we don't need ->rq_timed_out_fn */ if (!q->mq_ops && !q->rq_timed_out_fn) return; |