block: correct the blk drain name comment
Subsystems (2)
After patch commit 807592a4fafb("block: Let blk_drain_queue() caller obtain the queue lock") the function blk_drain_queue() had been renamed to __blk_drain_queue(), so correct the related comments.
--- block/blk-cgroup.c | 2 +- block/blk-core.c | 2 +- include/linux/blkdev.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
block/blk-cgroup.c +1 -1
@@ -856,7 +856,7 @@ int blkcg_init_queue(struct request_queue *q)* blkcg_drain_queue - drain blkcg part of request_queue * @q: request_queue to drain * -* Called from blk_drain_queue(). Responsible for draining blkcg part. +* Called from __blk_drain_queue(). Responsible for draining blkcg part. */ void blkcg_drain_queue (struct request_queue *q) {
block/blk-core.c +1 -1
@@ -279,7 +279,7 @@ inline void __blk_run_queue_uncond(struct request_queue *q)* Some request_fn implementations, e.g. scsi_request_fn(), unlock * the queue lock internally. As a result multiple threads may be * running such a request function concurrently. Keep track of the -* number of active request_fn invocations such that blk_drain_queue() +* number of active request_fn invocations such that __blk_drain_queue() * can wait until all these request_fn calls have finished. */ q->request_fn_active++;
include/linux/blkdev.h +1 -1
@@ -421,7 +421,7 @@ struct request_queue {unsigned int nr_sorted;unsigned int in_flight[2 ];/* -* Number of active block driver functions for which blk_drain_queue() +* Number of active block driver functions for which __blk_drain_queue() * must wait. Must be incremented around functions that unlock the * queue_lock internally, e.g. scsi_request_fn(). */
Signature · 1 line
1.8.3
Please ignore the message, I forget to modify the SOB message. Sorry for this.
Thanks!
Weng Meiling
Quoted 51 lines · Weng Meiling
After patch commit 807592a4fafb("block: Let
blk_drain_queue()caller obtain the queue lock") the functionblk_drain_queue()had been renamed to__blk_drain_queue(), so correct the related comments.Signed-off-by Qiang Huang <[email protected]>--- block/blk-cgroup.c | 2 +- block/blk-core.c | 2 +- include/linux/blkdev.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)block/blk-cgroup.c +1
-1@@ -856,7 +856,7 @@ int blkcg_init_queue(struct request_queue *q)* blkcg_drain_queue - drain blkcg part of request_queue * @q: request_queue to drain * -* Called from blk_drain_queue(). Responsible for draining blkcg part. +* Called from __blk_drain_queue(). Responsible for draining blkcg part. */ void blkcg_drain_queue (struct request_queue *q) {block/blk-core.c +1
-1@@ -279,7 +279,7 @@ inline void __blk_run_queue_uncond(struct request_queue *q)* Some request_fn implementations, e.g. scsi_request_fn(), unlock * the queue lock internally. As a result multiple threads may be * running such a request function concurrently. Keep track of the -* number of active request_fn invocations such that blk_drain_queue() +* number of active request_fn invocations such that __blk_drain_queue() * can wait until all these request_fn calls have finished. */ q->request_fn_active++;include/linux/blkdev.h +1
-1@@ -421,7 +421,7 @@ struct request_queue {unsigned int nr_sorted;unsigned int in_flight[2 ];/* -* Number of active block driver functions for which blk_drain_queue() +* Number of active block driver functions for which __blk_drain_queue() * must wait. Must be incremented around functions that unlock the * queue_lock internally, e.g. scsi_request_fn(). */
PATCH 1/1 block: correct the block drain function name on comment
After patch commit 807592a4fafb("block: Let blk_drain_queue() caller obtain the queue lock") the function blk_drain_queue() had been renamed to __blk_drain_queue(), so correct the related comments.
--- block/blk-cgroup.c | 2 +- block/blk-core.c | 2 +- include/linux/blkdev.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
block/blk-cgroup.c +1 -1
@@ -856,7 +856,7 @@ int blkcg_init_queue(struct request_queue *q)* blkcg_drain_queue - drain blkcg part of request_queue * @q: request_queue to drain * -* Called from blk_drain_queue(). Responsible for draining blkcg part. +* Called from __blk_drain_queue(). Responsible for draining blkcg part. */ void blkcg_drain_queue (struct request_queue *q) {
block/blk-core.c +1 -1
@@ -279,7 +279,7 @@ inline void __blk_run_queue_uncond(struct request_queue *q)* Some request_fn implementations, e.g. scsi_request_fn(), unlock * the queue lock internally. As a result multiple threads may be * running such a request function concurrently. Keep track of the -* number of active request_fn invocations such that blk_drain_queue() +* number of active request_fn invocations such that __blk_drain_queue() * can wait until all these request_fn calls have finished. */ q->request_fn_active++;
include/linux/blkdev.h +1 -1
@@ -421,7 +421,7 @@ struct request_queue {unsigned int nr_sorted;unsigned int in_flight[2 ];/* -* Number of active block driver functions for which blk_drain_queue() +* Number of active block driver functions for which __blk_drain_queue() * must wait. Must be incremented around functions that unlock the * queue_lock internally, e.g. scsi_request_fn(). */
-- 1.8.3