diff options
author | Richard Kennedy <richard@rsk.demon.co.uk> | 2010-04-14 20:54:03 +0200 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-21 17:42:08 +0200 |
commit | a534dbe96e9929c7245924d8252d89048c23d569 (patch) | |
tree | 394151a29dc2ea43e20cbf5b605732525ce09d9d /net/mac80211 | |
parent | 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa (diff) | |
download | op-kernel-dev-a534dbe96e9929c7245924d8252d89048c23d569.zip op-kernel-dev-a534dbe96e9929c7245924d8252d89048c23d569.tar.gz |
block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer
blk_rq_timed_out_timer() relied on blk_add_timer() never returning a
timer value of zero, but commit 7838c15b8dd18e78a523513749e5b54bda07b0cb
removed the code that bumped this value when it was zero.
Therefore when jiffies is near wrap we could get unlucky & not set the
timeout value correctly.
This patch uses a flag to indicate that the timeout value was set and so
handles jiffies wrap correctly, and it keeps all the logic in one
function so should be easier to maintain in the future.
Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'net/mac80211')
0 files changed, 0 insertions, 0 deletions