All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] blk-mq-sched: Enable merging discard bio into request
@ 2018-02-01 21:41 ` Keith Busch
  0 siblings, 0 replies; 4+ messages in thread
From: Keith Busch @ 2018-02-01 21:41 UTC (permalink / raw)
  To: Linux Block, Jens Axboe; +Cc: Linux NVMe, Christoph Hellwig, Keith Busch

Signed-off-by: Keith Busch <keith.busch@intel.com>
---
 block/blk-mq-sched.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 55c0a745b427..25c14c58385c 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -259,6 +259,8 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
 		if (!*merged_request)
 			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);
 		return true;
+	case ELEVATOR_DISCARD_MERGE:
+		return bio_attempt_discard_merge(q, rq, bio);
 	default:
 		return false;
 	}
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] blk-mq-sched: Enable merging discard bio into request
@ 2018-02-01 21:41 ` Keith Busch
  0 siblings, 0 replies; 4+ messages in thread
From: Keith Busch @ 2018-02-01 21:41 UTC (permalink / raw)


Signed-off-by: Keith Busch <keith.busch at intel.com>
---
 block/blk-mq-sched.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 55c0a745b427..25c14c58385c 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -259,6 +259,8 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
 		if (!*merged_request)
 			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);
 		return true;
+	case ELEVATOR_DISCARD_MERGE:
+		return bio_attempt_discard_merge(q, rq, bio);
 	default:
 		return false;
 	}
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] blk-mq-sched: Enable merging discard bio into request
  2018-02-01 21:41 ` Keith Busch
@ 2018-02-01 21:45   ` Jens Axboe
  -1 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2018-02-01 21:45 UTC (permalink / raw)
  To: Keith Busch, Linux Block; +Cc: Linux NVMe, Christoph Hellwig

On 2/1/18 2:41 PM, Keith Busch wrote:
> Signed-off-by: Keith Busch <keith.busch@intel.com>
> ---
>  block/blk-mq-sched.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
> index 55c0a745b427..25c14c58385c 100644
> --- a/block/blk-mq-sched.c
> +++ b/block/blk-mq-sched.c
> @@ -259,6 +259,8 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
>  		if (!*merged_request)
>  			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);
>  		return true;
> +	case ELEVATOR_DISCARD_MERGE:
> +		return bio_attempt_discard_merge(q, rq, bio);
>  	default:
>  		return false;

Thanks Keith, applied.

-- 
Jens Axboe

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH] blk-mq-sched: Enable merging discard bio into request
@ 2018-02-01 21:45   ` Jens Axboe
  0 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2018-02-01 21:45 UTC (permalink / raw)


On 2/1/18 2:41 PM, Keith Busch wrote:
> Signed-off-by: Keith Busch <keith.busch at intel.com>
> ---
>  block/blk-mq-sched.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
> index 55c0a745b427..25c14c58385c 100644
> --- a/block/blk-mq-sched.c
> +++ b/block/blk-mq-sched.c
> @@ -259,6 +259,8 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
>  		if (!*merged_request)
>  			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);
>  		return true;
> +	case ELEVATOR_DISCARD_MERGE:
> +		return bio_attempt_discard_merge(q, rq, bio);
>  	default:
>  		return false;

Thanks Keith, applied.

-- 
Jens Axboe

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-02-01 21:45 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-01 21:41 [PATCH] blk-mq-sched: Enable merging discard bio into request Keith Busch
2018-02-01 21:41 ` Keith Busch
2018-02-01 21:45 ` Jens Axboe
2018-02-01 21:45   ` Jens Axboe

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.