src/patches/suse-2.6.27.31/patches.fixes/block-add-comment-in-blk_rq_timed_out

   1 Subject: block: add comment in blk_rq_timed_out() about why next can not be 0
   2 From: Jens Axboe <jens.axboe@oracle.com>
   3 Date: Mon Dec 29 08:28:42 2008 +0100:
   4 Git: 65d3618ccfe686e8d7b3f01a838d0578182406df
   5 References: bnc#464155
   6
   7 Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
   8 Signed-off-by: Hannes Reinecke <hare@suse.de>
   9
  10 ---
  11  block/blk-timeout.c |    7 ++++++-
  12  1 file changed, 6 insertions(+), 1 deletion(-)
  13
  14 --- a/block/blk-timeout.c
  15 +++ b/block/blk-timeout.c
  16 @@ -69,7 +69,12 @@ void blk_rq_timed_out_timer(unsigned lon
  17                 }
  18         }
  19
  20 -       if (next_set && !list_empty(&q->timeout_list))
  21 +       /*
  22 +        * next can never be 0 here with the list non-empty, since we always
  23 +        * bump ->deadline to 1 so we can detect if the timer was ever added
  24 +        * or not. See comment in blk_add_timer()
  25 +        */
  26 +       if (next)
  27                 mod_timer(&q->timeout, round_jiffies_up(next));
  28
  29         spin_unlock_irqrestore(q->queue_lock, flags);