]> www.infradead.org Git - users/jedix/linux-maple.git/commit
block: Fix mismerge in queue freeze logic
authorMartin K. Petersen <martin.petersen@oracle.com>
Sun, 11 Jun 2017 01:55:44 +0000 (18:55 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 18 Jun 2017 21:03:43 +0000 (14:03 -0700)
commit8b44878598e3cadc0ee40683b521f6e11fbfbee1
treee41695939d5e05687bf00dea04cc874e5033185b
parentb2163fa15c5f1c08f9d12f6e84a8fd42b64b0869
block: Fix mismerge in queue freeze logic

Commit 7466bf8e2078 ("blk-mq: fix freeze queue race") introduced a mutex
to protect the queue freeze/unfreeze logic.

The locking requirement was obsoleted by commit c03fa711de6a ("block:
use an atomic_t for mq_freeze_depth") but the mutex was left in place in
our backport.

During the c311ca8a3d93 merge of the pmem tree conflicts arose in
blk-mq. The mutex lock calls were removed but the mutex unlocks left in
place. This lead to NVMe controller reset failures in ED testing. Remove
the last remnants of commit 7466bf8e2078.

Orabug: 26254388

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
block/blk-core.c
block/blk-mq.c
include/linux/blkdev.h