From: Jens Axboe <axboe@fb.com>
To: <axboe@kernel.dk>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <paolo.valente@linaro.org>, <osandov@fb.com>, Jens Axboe <axboe@fb.com>
Subject: [PATCH 3/8] block: move rq_ioc() to blk.h
Date: Fri, 16 Dec 2016 17:12:11 -0700 [thread overview]
Message-ID: <1481933536-12844-4-git-send-email-axboe@fb.com> (raw)
In-Reply-To: <1481933536-12844-1-git-send-email-axboe@fb.com>
We want to use it outside of blk-core.c.
Signed-off-by: Jens Axboe <axboe@fb.com>
---
block/blk-core.c | 16 ----------------
block/blk.h | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 61ba08c58b64..92baea07acbc 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1040,22 +1040,6 @@ static bool blk_rq_should_init_elevator(struct bio *bio)
}
/**
- * rq_ioc - determine io_context for request allocation
- * @bio: request being allocated is for this bio (can be %NULL)
- *
- * Determine io_context to use for request allocation for @bio. May return
- * %NULL if %current->io_context doesn't exist.
- */
-static struct io_context *rq_ioc(struct bio *bio)
-{
-#ifdef CONFIG_BLK_CGROUP
- if (bio && bio->bi_ioc)
- return bio->bi_ioc;
-#endif
- return current->io_context;
-}
-
-/**
* __get_request - get a free request
* @rl: request list to allocate from
* @op: operation and flags
diff --git a/block/blk.h b/block/blk.h
index f46c0ac8ae3d..9a716b5925a4 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -264,6 +264,22 @@ void ioc_clear_queue(struct request_queue *q);
int create_task_io_context(struct task_struct *task, gfp_t gfp_mask, int node);
/**
+ * rq_ioc - determine io_context for request allocation
+ * @bio: request being allocated is for this bio (can be %NULL)
+ *
+ * Determine io_context to use for request allocation for @bio. May return
+ * %NULL if %current->io_context doesn't exist.
+ */
+static inline struct io_context *rq_ioc(struct bio *bio)
+{
+#ifdef CONFIG_BLK_CGROUP
+ if (bio && bio->bi_ioc)
+ return bio->bi_ioc;
+#endif
+ return current->io_context;
+}
+
+/**
* create_io_context - try to create task->io_context
* @gfp_mask: allocation mask
* @node: allocation node
--
2.7.4
next prev parent reply other threads:[~2016-12-17 0:12 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-17 0:12 [PATCHSET v4] blk-mq-scheduling framework Jens Axboe
2016-12-17 0:12 ` [PATCH 1/8] block: move existing elevator ops to union Jens Axboe
2016-12-17 0:12 ` [PATCH 2/8] blk-mq: make mq_ops a const pointer Jens Axboe
2016-12-17 0:12 ` Jens Axboe [this message]
2016-12-20 10:12 ` [PATCH 3/8] block: move rq_ioc() to blk.h Paolo Valente
2016-12-20 15:46 ` Jens Axboe
2016-12-20 22:14 ` Jens Axboe
2016-12-17 0:12 ` [PATCH 4/8] blk-mq: un-export blk_mq_free_hctx_request() Jens Axboe
2016-12-17 0:12 ` [PATCH 5/8] blk-mq: export some helpers we need to the scheduling framework Jens Axboe
2016-12-17 0:12 ` [PATCH 6/8] blk-mq-sched: add framework for MQ capable IO schedulers Jens Axboe
2016-12-20 11:55 ` Paolo Valente
2016-12-20 15:45 ` Jens Axboe
2016-12-21 2:22 ` Jens Axboe
2016-12-22 15:20 ` Paolo Valente
2016-12-22 9:59 ` Paolo Valente
2016-12-22 11:13 ` Paolo Valente
2017-01-17 2:47 ` Jens Axboe
2017-01-17 10:13 ` Paolo Valente
2017-01-17 12:38 ` Jens Axboe
2016-12-23 10:12 ` Paolo Valente
2017-01-17 2:47 ` Jens Axboe
2017-01-17 9:17 ` Paolo Valente
2016-12-17 0:12 ` [PATCH 7/8] mq-deadline: add blk-mq adaptation of the deadline IO scheduler Jens Axboe
2016-12-20 9:34 ` Paolo Valente
2016-12-20 15:46 ` Jens Axboe
2016-12-21 11:59 ` Bart Van Assche
2016-12-21 14:22 ` Jens Axboe
2016-12-22 16:07 ` Paolo Valente
2017-01-17 2:47 ` Jens Axboe
2016-12-22 16:49 ` Paolo Valente
2017-01-17 2:47 ` Jens Axboe
2017-01-20 11:07 ` Paolo Valente
2017-01-20 14:26 ` Jens Axboe
2017-01-20 13:14 ` Paolo Valente
2017-01-20 13:18 ` Paolo Valente
2017-01-20 14:28 ` Jens Axboe
2017-01-20 14:28 ` Jens Axboe
2017-02-01 11:11 ` Paolo Valente
2017-02-02 5:19 ` Jens Axboe
2017-02-02 9:19 ` Paolo Valente
2017-02-02 15:30 ` Jens Axboe
2017-02-02 21:15 ` Paolo Valente
2017-02-02 21:32 ` Jens Axboe
2017-02-07 17:27 ` Paolo Valente
2017-02-01 11:56 ` Paolo Valente
2017-02-02 5:20 ` Jens Axboe
2017-02-16 10:46 ` Paolo Valente
2017-02-16 15:35 ` Jens Axboe
2016-12-17 0:12 ` [PATCH 8/8] blk-mq-sched: allow setting of default " Jens Axboe
2016-12-19 11:32 ` [PATCHSET v4] blk-mq-scheduling framework Paolo Valente
2016-12-19 15:20 ` Jens Axboe
2016-12-19 15:33 ` Jens Axboe
2016-12-19 18:21 ` Paolo Valente
2016-12-19 21:05 ` Jens Axboe
2016-12-22 15:28 ` Paolo Valente
2017-01-17 2:47 ` Jens Axboe
2017-01-17 10:49 ` Paolo Valente
2017-01-18 16:14 ` Paolo Valente
2017-01-18 16:21 ` Jens Axboe
2017-01-23 17:04 ` Paolo Valente
2017-01-23 17:42 ` Jens Axboe
2017-01-25 8:46 ` Paolo Valente
2017-01-25 16:13 ` Jens Axboe
2017-01-26 14:23 ` Paolo Valente
2016-12-22 16:23 ` Bart Van Assche
2016-12-22 16:52 ` Omar Sandoval
2016-12-22 16:57 ` Bart Van Assche
2016-12-22 17:12 ` Omar Sandoval
2016-12-22 17:39 ` Bart Van Assche
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=1481933536-12844-4-git-send-email-axboe@fb.com \
--to=axboe@fb.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=osandov@fb.com \
--cc=paolo.valente@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).