public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Weng Meiling <wengmeiling.weng@huawei.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Li Zefan <lizefan@huawei.com>, Jens Axboe <axboe@kernel.dk>,
	Huang Qiang <h.huangqiang@huawei.com>
Subject: block: correct the blk drain name comment
Date: Mon, 12 May 2014 17:39:19 +0800	[thread overview]
Message-ID: <537096C7.7040500@huawei.com> (raw)

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.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
---
 block/blk-cgroup.c     | 2 +-
 block/blk-core.c       | 2 +-
 include/linux/blkdev.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index e4a4145..8234eb1 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -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)
 {
diff --git a/block/blk-core.c b/block/blk-core.c
index a0e3096..f62d8a0 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -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++;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0d84981..4835cc9 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -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


             reply	other threads:[~2014-05-12  9:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-12  9:39 Weng Meiling [this message]
2014-05-12 10:02 ` block: correct the blk drain name comment Weng Meiling
2014-05-12 10:06   ` [PATCH] block: correct the block drain function name on comment Weng Meiling

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=537096C7.7040500@huawei.com \
    --to=wengmeiling.weng@huawei.com \
    --cc=axboe@kernel.dk \
    --cc=h.huangqiang@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox