2019-05-23 15:45:55

by Pavel Begunkov

[permalink] [raw]
Subject: [PATCH 1/1] blk-core: Remove blk_end_request*() declarations

From: Pavel Begunkov <[email protected]>

Commit a1ce35fa49852db60fc6e268 ("block: remove dead elevator code")
deleted blk_end_request() and friends, but some declaration are still
left. Purge them.

Signed-off-by: Pavel Begunkov <[email protected]>
---
block/blk-core.c | 2 +-
include/linux/blkdev.h | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index 419d600e6637..48ba4783437f 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1393,7 +1393,7 @@ EXPORT_SYMBOL_GPL(blk_steal_bios);
*
* This special helper function is only for request stacking drivers
* (e.g. request-based dm) so that they can handle partial completion.
- * Actual device drivers should use blk_end_request instead.
+ * Actual device drivers should use blk_mq_end_request instead.
*
* Passing the result of blk_rq_bytes() as @nr_bytes guarantees
* %false return from this function.
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1aafeb923e7b..d069b5e2a295 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1021,21 +1021,9 @@ void blk_steal_bios(struct bio_list *list, struct request *rq);
*
* blk_update_request() completes given number of bytes and updates
* the request without completing it.
- *
- * blk_end_request() and friends. __blk_end_request() must be called
- * with the request queue spinlock acquired.
- *
- * Several drivers define their own end_request and call
- * blk_end_request() for parts of the original function.
- * This prevents code duplication in drivers.
*/
extern bool blk_update_request(struct request *rq, blk_status_t error,
unsigned int nr_bytes);
-extern void blk_end_request_all(struct request *rq, blk_status_t error);
-extern bool __blk_end_request(struct request *rq, blk_status_t error,
- unsigned int nr_bytes);
-extern void __blk_end_request_all(struct request *rq, blk_status_t error);
-extern bool __blk_end_request_cur(struct request *rq, blk_status_t error);

extern void __blk_complete_request(struct request *);
extern void blk_abort_request(struct request *);
--
2.21.0


2019-06-19 17:36:40

by Pavel Begunkov

[permalink] [raw]
Subject: Re: [PATCH 1/1] blk-core: Remove blk_end_request*() declarations

Ping?

On 23/05/2019 18:43, Pavel Begunkov (Silence) wrote:
> From: Pavel Begunkov <[email protected]>
>
> Commit a1ce35fa49852db60fc6e268 ("block: remove dead elevator code")
> deleted blk_end_request() and friends, but some declaration are still
> left. Purge them.
>
> Signed-off-by: Pavel Begunkov <[email protected]>
> ---
> block/blk-core.c | 2 +-
> include/linux/blkdev.h | 12 ------------
> 2 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/block/blk-core.c b/block/blk-core.c
> index 419d600e6637..48ba4783437f 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -1393,7 +1393,7 @@ EXPORT_SYMBOL_GPL(blk_steal_bios);
> *
> * This special helper function is only for request stacking drivers
> * (e.g. request-based dm) so that they can handle partial completion.
> - * Actual device drivers should use blk_end_request instead.
> + * Actual device drivers should use blk_mq_end_request instead.
> *
> * Passing the result of blk_rq_bytes() as @nr_bytes guarantees
> * %false return from this function.
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 1aafeb923e7b..d069b5e2a295 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1021,21 +1021,9 @@ void blk_steal_bios(struct bio_list *list, struct request *rq);
> *
> * blk_update_request() completes given number of bytes and updates
> * the request without completing it.
> - *
> - * blk_end_request() and friends. __blk_end_request() must be called
> - * with the request queue spinlock acquired.
> - *
> - * Several drivers define their own end_request and call
> - * blk_end_request() for parts of the original function.
> - * This prevents code duplication in drivers.
> */
> extern bool blk_update_request(struct request *rq, blk_status_t error,
> unsigned int nr_bytes);
> -extern void blk_end_request_all(struct request *rq, blk_status_t error);
> -extern bool __blk_end_request(struct request *rq, blk_status_t error,
> - unsigned int nr_bytes);
> -extern void __blk_end_request_all(struct request *rq, blk_status_t error);
> -extern bool __blk_end_request_cur(struct request *rq, blk_status_t error);
>
> extern void __blk_complete_request(struct request *);
> extern void blk_abort_request(struct request *);
>

--
Yours sincerely,
Pavel Begunkov


Attachments:
signature.asc (849.00 B)
OpenPGP digital signature

2019-06-20 09:27:25

by Jens Axboe

[permalink] [raw]
Subject: Re: [PATCH 1/1] blk-core: Remove blk_end_request*() declarations

On 5/23/19 9:43 AM, Pavel Begunkov (Silence) wrote:
> From: Pavel Begunkov <[email protected]>
>
> Commit a1ce35fa49852db60fc6e268 ("block: remove dead elevator code")
> deleted blk_end_request() and friends, but some declaration are still
> left. Purge them.

Applied, thanks.

--
Jens Axboe