Commit 2eef33e4 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: clean up misc stuff after block layer timeout conversion 



* In blk_rq_timed_out_timer(), else { if } to else if

* In blk_add_timer(), simplify if/else block

[ Impact: cleanup ]

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 10732f56

block/blk-timeout.c

+9 −13
Original line number Diff line number Diff line
@@ -122,11 +122,9 @@ void blk_rq_timed_out_timer(unsigned long data) 
			if (blk_mark_rq_complete(rq))

				continue;

			blk_rq_timed_out(rq);

		} else {

			if (!next || time_after(next, rq->deadline))

		} else if (!next || time_after(next, rq->deadline))

			next = rq->deadline;

	}

	}



	/*

	 * next can never be 0 here with the list non-empty, since we always
@@ -176,16 +174,14 @@ void blk_add_timer(struct request *req) 
	BUG_ON(!list_empty(&req->timeout_list));

	BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags));



	if (req->timeout)

		req->deadline = jiffies + req->timeout;

	else {

		req->deadline = jiffies + q->rq_timeout;

	/*

		 * Some LLDs, like scsi, peek at the timeout to prevent

		 * a command from being retried forever.

	 * Some LLDs, like scsi, peek at the timeout to prevent a

	 * command from being retried forever.

	 */

	if (!req->timeout)

		req->timeout = q->rq_timeout;

	}



	req->deadline = jiffies + req->timeout;

	list_add_tail(&req->timeout_list, &q->timeout_list);



	/*