On Wed, 2018-07-11 at 15:41 +0200, Greg KH wrote:
> Why have you rewritten commit 7dd1ab163c17 ("nvme: validate admin
> queue
> before unquiesce") here? Why not just backport it directly?
Initially, it seemed clearer to me to rewrite it as a standalone patch
because it didn't apply cleanly due to the different functions being
called, and because 4.9 does not have the 'Fixes 443bd90f2cca: "nvme:
host: unquiesce queue in nvme_kill_queues()"' commit that the upstream
commit refers to, but is affected nonetheless.
7dd1ab163c17e114 ("nvme: validate admin queue before unquiesce")
patches the blk_mq_unquiesce_queue() call, which upstream has but 4.9
doesn't -- that call is added in 443bd90f2cca9dec ("nvme: host:
unquiesce queue in nvme_kill_queues()").
My proposed patch adds the check before the blk_mq_start_hw_queues()
call, which 4.9 has, but upstream no longer does since 8d7b8fafad87c340
("nvme: kick requeue list when requeueing a request instead of when
starting the queues").
I agree that both patches essentially do the same thing and fix the
same error symptom. I will prepare a backported version of
7dd1ab163c17e114 instead to preserve the history from the upstream
commit.
Simon
Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
