nvme-fc: Utilise min3() to simplify queue count calculation
Subsystems (2)
PATCH RESEND 1/1 nvme-fc: Utilise min3() to simplify queue count calculation
Refactor nvme_fc_create_io_queues() and nvme_fc_recreate_io_queues() to use the min3() macro to find the minimum between 3 values instead of multiple min()'s. This shortens the code and makes it easier to read.
Signed-off-by Qasim Ijaz <[email protected]>
--- drivers/nvme/host/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/fc.c +2 -2
@@ -2897,7 +2897,7 @@ nvme_fc_create_io_queues(struct nvme_fc_ctrl *ctrl)unsigned int nr_io_queues;int ret; - nr_io_queues =min (min (opts->nr_io_queues,num_online_cpus ()), + nr_io_queues =min3 (opts->nr_io_queues,num_online_cpus (), ctrl->lport->ops->max_hw_queues); ret =nvme_set_queue_count (&ctrl->ctrl, &nr_io_queues);if (ret) {
@@ -2951,7 +2951,7 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)unsigned int nr_io_queues;int ret; - nr_io_queues =min (min (opts->nr_io_queues,num_online_cpus ()), + nr_io_queues =min3 (opts->nr_io_queues,num_online_cpus (), ctrl->lport->ops->max_hw_queues); ret =nvme_set_queue_count (&ctrl->ctrl, &nr_io_queues);if (ret) {
Signature · 1 line
2.39.5
Quoted 3 lines · Qasim Ijaz
Refactor
nvme_fc_create_io_queues()andnvme_fc_recreate_io_queues()to use themin3()macro to find the minimum between 3 values instead of multiple min()'s. This shortens the code and makes it easier to read.
Thanks, applied to nvem-6.15.