[PATCH 1/2] block: update documentation for blk_rq_timeout()

[PATCH 1/2] block: update documentation for blk_rq_timeout()

[Julian Wiedmann]

Requests don't have their own timers anymore, they share the queue's
timer instead.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
---
 block/blk-timeout.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 1b8de0417fc1..61430575cb58 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -122,8 +122,8 @@ unsigned long blk_rq_timeout(unsigned long timeout)
  * @req:	request that is about to start running.
  *
  * Notes:
- *    Each request has its own timer, and as it is added to the queue, we
- *    set up the timer. When the request completes, we cancel the timer.
+ *    Each request has its own timeout. As a request is added to the queue,
+ *    we start/adjust the queue's timer to keep track of the earliest timeout.
  */
 void blk_add_timer(struct request *req)
 {
-- 
2.17.1

[PATCH 2/2] block: fix kerneldoc typos

[Julian Wiedmann]

Correct a misspelled 'submitted', and add a whitespace.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
---
 block/blk-core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index 2db8bda43b6e..c0b2ead059ca 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1047,8 +1047,8 @@ blk_qc_t submit_bio_noacct(struct bio *bio)
 	/*
 	 * We only want one ->submit_bio to be active at a time, else stack
 	 * usage with stacked devices could be a problem.  Use current->bio_list
-	 * to collect a list of requests submited by a ->submit_bio method while
-	 * it is active, and then process them after it returned.
+	 * to collect a list of requests submitted by a ->submit_bio method
+	 * while it is active, and then process them after it returned.
 	 */
 	if (current->bio_list) {
 		bio_list_add(&current->bio_list[0], bio);
@@ -1071,7 +1071,7 @@ EXPORT_SYMBOL(submit_bio_noacct);
  *
  * The success/failure status of the request, along with notification of
  * completion, is delivered asynchronously through the ->bi_end_io() callback
- * in @bio.  The bio must NOT be touched by thecaller until ->bi_end_io() has
+ * in @bio.  The bio must NOT be touched by the caller until ->bi_end_io() has
  * been called.
  */
 blk_qc_t submit_bio(struct bio *bio)
-- 
2.17.1