[PATCH] block: Remove unused definitions

[PATCH] block: Remove unused definitions

[Damien Le Moal]

The ELV_MQUEUE_XXX definitions in include/linux/elevator.h are unused
since the removal of elevator_may_queue_fn in kernel 5.0. Remove these
definitions and also remove the documentation of elevator_may_queue_fn
in Documentiation/block/biodoc.txt.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
 Documentation/block/biodoc.txt | 5 -----
 include/linux/elevator.h       | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index ac18b488cb5e..f0d15b0cb3c0 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -844,11 +844,6 @@ elevator_latter_req_fn		These return the request before or after the
 
 elevator_completed_req_fn	called when a request is completed.
 
-elevator_may_queue_fn		returns true if the scheduler wants to allow the
-				current context to queue a new request even if
-				it is over the queue limit. This must be used
-				very carefully!!
-
 elevator_set_req_fn
 elevator_put_req_fn		Must be used to allocate and free any elevator
 				specific storage for a request.
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 6e8bc53740f0..9842e53623f3 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -160,15 +160,6 @@ extern struct request *elv_rb_find(struct rb_root *, sector_t);
 #define ELEVATOR_INSERT_FLUSH	5
 #define ELEVATOR_INSERT_SORT_MERGE	6
 
-/*
- * return values from elevator_may_queue_fn
- */
-enum {
-	ELV_MQUEUE_MAY,
-	ELV_MQUEUE_NO,
-	ELV_MQUEUE_MUST,
-};
-
 #define rq_end_sector(rq)	(blk_rq_pos(rq) + blk_rq_sectors(rq))
 #define rb_entry_rq(node)	rb_entry((node), struct request, rb_node)
 
-- 
2.21.0

Re: [PATCH] block: Remove unused definitions

[Marcos Paulo de Souza]

On Thu, Jul 11, 2019 at 12:56:08AM +0900, Damien Le Moal wrote:
> The ELV_MQUEUE_XXX definitions in include/linux/elevator.h are unused
> since the removal of elevator_may_queue_fn in kernel 5.0. Remove these
> definitions and also remove the documentation of elevator_may_queue_fn
> in Documentiation/block/biodoc.txt.
> 
> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
> ---
>  Documentation/block/biodoc.txt | 5 -----
>  include/linux/elevator.h       | 9 ---------
>  2 files changed, 14 deletions(-)
> 
> diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
> index ac18b488cb5e..f0d15b0cb3c0 100644
> --- a/Documentation/block/biodoc.txt
> +++ b/Documentation/block/biodoc.txt
> @@ -844,11 +844,6 @@ elevator_latter_req_fn		These return the request before or after the
>  
>  elevator_completed_req_fn	called when a request is completed.
>  
> -elevator_may_queue_fn		returns true if the scheduler wants to allow the
> -				current context to queue a new request even if
> -				it is over the queue limit. This must be used
> -				very carefully!!
> -
>  elevator_set_req_fn
>  elevator_put_req_fn		Must be used to allocate and free any elevator
>  				specific storage for a request.
> diff --git a/include/linux/elevator.h b/include/linux/elevator.h
> index 6e8bc53740f0..9842e53623f3 100644
> --- a/include/linux/elevator.h
> +++ b/include/linux/elevator.h
> @@ -160,15 +160,6 @@ extern struct request *elv_rb_find(struct rb_root *, sector_t);
>  #define ELEVATOR_INSERT_FLUSH	5
>  #define ELEVATOR_INSERT_SORT_MERGE	6
>  
> -/*
> - * return values from elevator_may_queue_fn
> - */
> -enum {
> -	ELV_MQUEUE_MAY,
> -	ELV_MQUEUE_NO,
> -	ELV_MQUEUE_MUST,
> -};

Acked-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>

> -
>  #define rq_end_sector(rq)	(blk_rq_pos(rq) + blk_rq_sectors(rq))
>  #define rb_entry_rq(node)	rb_entry((node), struct request, rb_node)
>  
> -- 
> 2.21.0
> 

Re: [PATCH] block: Remove unused definitions

[Jens Axboe]

On 7/10/19 9:56 AM, Damien Le Moal wrote:
> The ELV_MQUEUE_XXX definitions in include/linux/elevator.h are unused
> since the removal of elevator_may_queue_fn in kernel 5.0. Remove these
> definitions and also remove the documentation of elevator_may_queue_fn
> in Documentiation/block/biodoc.txt.

Applied, thanks.

-- 
Jens Axboe