Skip to content

Commit bdaa136

Browse files
jsmart-ghChristoph Hellwig
authored andcommitted
nvme-fc: remove freeze/unfreeze around update_nr_hw_queues
Remove the freeze/unfreeze around changes to the number of hardware queues. Study and retest has indicated there are no ios that can be active at this point so there is nothing to freeze. nvme-fc is draining the queues in the shutdown and error recovery path in __nvme_fc_abort_outstanding_ios. This patch primarily reverts 88e837e "nvme-fc: wait for queues to freeze before calling update_hr_hw_queues". It's not an exact revert as it leaves the adjusting of hw queues only if the count changes. Signed-off-by: James Smart <[email protected]> [dwagner: added explanation why no IO is pending] Signed-off-by: Daniel Wagner <[email protected]> Reviewed-by: Ming Lei <[email protected]> Reviewed-by: Himanshu Madhani <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent e5445da commit bdaa136

File tree

1 file changed

+0
-2
lines changed
  • drivers/nvme/host

1 file changed

+0
-2
lines changed

drivers/nvme/host/fc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,9 +2957,7 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)
29572957
dev_info(ctrl->ctrl.device,
29582958
"reconnect: revising io queue count from %d to %d\n",
29592959
prior_ioq_cnt, nr_io_queues);
2960-
nvme_wait_freeze(&ctrl->ctrl);
29612960
blk_mq_update_nr_hw_queues(&ctrl->tag_set, nr_io_queues);
2962-
nvme_unfreeze(&ctrl->ctrl);
29632961
}
29642962

29652963
ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1);

0 commit comments

Comments
 (0)