[PATCH] block: Remove unused flush_queue_delayed in struct blk_flush_queue

[PATCH] block: Remove unused flush_queue_delayed in struct blk_flush_queue

[Baolin Wang]

The flush_queue_delayed was introdued to hold queue if flush is
running for non-queueable flush drive by commit 3ac0cc450870
("hold queue if flush is running for non-queueable flush drive"),
but the non mq parts of the flush code had been removed by
commit 7e992f847a08 ("block: remove non mq parts from the flush code"),
as well as removing the usage of the flush_queue_delayed flag.
Thus remove the unused flush_queue_delayed flag.

Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
---
 block/blk-flush.c | 1 -
 block/blk.h       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/block/blk-flush.c b/block/blk-flush.c
index c7f396e3d5e2..b733f7ac75c7 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -258,7 +258,6 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
 		blk_flush_complete_seq(rq, fq, seq, error);
 	}
 
-	fq->flush_queue_delayed = 0;
 	spin_unlock_irqrestore(&fq->mq_flush_lock, flags);
 }
 
diff --git a/block/blk.h b/block/blk.h
index fc00537026a0..6cab33a11f90 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -19,7 +19,6 @@ extern struct dentry *blk_debugfs_root;
 #endif
 
 struct blk_flush_queue {
-	unsigned int		flush_queue_delayed:1;
 	unsigned int		flush_pending_idx:1;
 	unsigned int		flush_running_idx:1;
 	blk_status_t 		rq_status;
-- 
2.17.1

Re: [PATCH] block: Remove unused flush_queue_delayed in struct blk_flush_queue

[Ming Lei]

On Sun, May 17, 2020 at 7:51 PM Baolin Wang <baolin.wang7@gmail.com> wrote:
>
> The flush_queue_delayed was introdued to hold queue if flush is
> running for non-queueable flush drive by commit 3ac0cc450870
> ("hold queue if flush is running for non-queueable flush drive"),
> but the non mq parts of the flush code had been removed by
> commit 7e992f847a08 ("block: remove non mq parts from the flush code"),
> as well as removing the usage of the flush_queue_delayed flag.
> Thus remove the unused flush_queue_delayed flag.
>
> Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
> ---
>  block/blk-flush.c | 1 -
>  block/blk.h       | 1 -
>  2 files changed, 2 deletions(-)
>
> diff --git a/block/blk-flush.c b/block/blk-flush.c
> index c7f396e3d5e2..b733f7ac75c7 100644
> --- a/block/blk-flush.c
> +++ b/block/blk-flush.c
> @@ -258,7 +258,6 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
>                 blk_flush_complete_seq(rq, fq, seq, error);
>         }
>
> -       fq->flush_queue_delayed = 0;
>         spin_unlock_irqrestore(&fq->mq_flush_lock, flags);
>  }
>
> diff --git a/block/blk.h b/block/blk.h
> index fc00537026a0..6cab33a11f90 100644
> --- a/block/blk.h
> +++ b/block/blk.h
> @@ -19,7 +19,6 @@ extern struct dentry *blk_debugfs_root;
>  #endif
>
>  struct blk_flush_queue {
> -       unsigned int            flush_queue_delayed:1;
>         unsigned int            flush_pending_idx:1;
>         unsigned int            flush_running_idx:1;
>         blk_status_t            rq_status;
> --
> 2.17.1
>

Reviewed-by: Ming Lei <ming.lei@redhat.com>

-- 
Ming Lei

Re: [PATCH] block: Remove unused flush_queue_delayed in struct blk_flush_queue

[Jens Axboe]

On 5/17/20 5:49 AM, Baolin Wang wrote:
> The flush_queue_delayed was introdued to hold queue if flush is
> running for non-queueable flush drive by commit 3ac0cc450870
> ("hold queue if flush is running for non-queueable flush drive"),
> but the non mq parts of the flush code had been removed by
> commit 7e992f847a08 ("block: remove non mq parts from the flush code"),
> as well as removing the usage of the flush_queue_delayed flag.
> Thus remove the unused flush_queue_delayed flag.

Applied, thanks.

-- 
Jens Axboe