On Thu, Oct 14, 2021 at 12:34:21PM -0600, Jens Axboe wrote:
> diff --git a/block/blk-merge.c b/block/blk-merge.c
> index f390a8753268..575080ad0617 100644
> --- a/block/blk-merge.c
> +++ b/block/blk-merge.c
Even though the code is self-documenting, the current description on top
of this function is now outdated with this change.
- * Determine whether @bio being queued on @q can be merged with a request
- * on %current's plugged list. Returns %true if merge was successful,
+ * Determine whether @bio being queued on @q can be merged with the previous
+ * request on %current's plugged list. Returns %true if merge was successful,
* otherwise %false.
> @@ -1089,32 +1089,22 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,
> {
> struct blk_plug *plug;
> struct request *rq;
> - struct list_head *plug_list;
>
> plug = blk_mq_plug(q, bio);
> - if (!plug)
> + if (!plug || list_empty(&plug->mq_list))
> return false;
>
Regards,
Pankaj Raghav
