Revert "Revert "block, bfq: honor already-setup queue merges""

Revert "Revert "block, bfq: honor already-setup queue merges""

[ Upstream commit 13c568efdb9388996dfcb1b5d6bc9b489d0a7139 ]

A crash [1] happened to be triggered in conjunction with commit
fde25220c9a5 ("block, bfq: honor already-setup queue merges"). The
latter was then reverted by commit 6dad861d8d68 ("Revert "block, bfq:
honor already-setup queue merges""). Yet, the reverted commit was not
the one introducing the bug. In fact, it actually triggered a UAF
introduced by a different commit, and now fixed by commit 87b280b3944d
("block, bfq: reset last_bfqq_created on group change").

So, there is no point in keeping commit fde25220c9a5 ("block, bfq:
honor already-setup queue merges") out. This commit restores it.

[1] https://bugzilla.kernel.org/show_bug.cgi?id=214503

Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Link: https://lore.kernel.org/r/20211125181510.15004-1-paolo.valente@linaro.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>