2012-10-25 09:43:02

by Junichi Nomura

Subject: [PATCH 1/2] block: move blk_queue_bypass_{start,end} to include/linux/blkdev.h

[PATCH] block: move blk_queue_bypass_{start,end} to include/linux/blkdev.h

dm wants to use those functions to control the bypass status of
half-initialized device.

This patch is a preparation for:
[PATCH] dm: stay in blk_queue_bypass until queue becomes initialized

Signed-off-by: Jun'ichi Nomura <[email protected]>
Cc: Vivek Goyal <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Alasdair G Kergon <[email protected]>

---
block/blk.h | 2 --
include/linux/blkdev.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/blk.h b/block/blk.h
index ca51543..48bac5b 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -26,8 +26,6 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
struct bio *bio);
int blk_rq_append_bio(struct request_queue *q, struct request *rq,
struct bio *bio);
-void blk_queue_bypass_start(struct request_queue *q);
-void blk_queue_bypass_end(struct request_queue *q);
void blk_dequeue_request(struct request *rq);
void __blk_queue_free_tags(struct request_queue *q);
bool __blk_end_bidi_request(struct request *rq, int error,
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1756001..86ba153 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -949,6 +949,8 @@ bool __must_check blk_get_queue(struct request_queue *);
struct request_queue *blk_alloc_queue(gfp_t);
struct request_queue *blk_alloc_queue_node(gfp_t, int);
extern void blk_put_queue(struct request_queue *);
+void blk_queue_bypass_start(struct request_queue *q);
+void blk_queue_bypass_end(struct request_queue *q);

/*
* blk_plug permits building a queue of related requests by holding the I/O

2012-10-25 09:55:57

by Jens Axboe

Subject: Re: [PATCH 1/2] block: move blk_queue_bypass_{start,end} to include/linux/blkdev.h

On 2012-10-25 11:41, Jun'ichi Nomura wrote:
> [PATCH] block: move blk_queue_bypass_{start,end} to include/linux/blkdev.h
>
> dm wants to use those functions to control the bypass status of
> half-initialized device.
>
> This patch is a preparation for:
> [PATCH] dm: stay in blk_queue_bypass until queue becomes initialized

Applied. The previous state of private blk.h declaration but the symbols
exported was wrong, too.

--
Jens Axboe