openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvme-loop: remove some code duplication 

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Sagi Grimberg 2017-03-13 15:43:44 +02:00 committed by Jens Axboe
parent 782d820ca4
commit 297186d640
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/nvme/target/loop.c
View File

@ -349,6 +349,19 @@ static int nvme_loop_init_io_queues(struct nvme_loop_ctrl *ctrl)
return ret; return ret;
} }
static int nvme_loop_connect_io_queues(struct nvme_loop_ctrl *ctrl)
{
int i, ret;
for (i = 1; i < ctrl->queue_count; i++) {
ret = nvmf_connect_io_queue(&ctrl->ctrl, i);
if (ret)
return ret;
}
return 0;
}
static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl) static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl)
{ {
int error; int error;
@ -490,7 +503,7 @@ static void nvme_loop_reset_ctrl_work(struct work_struct *work)
struct nvme_loop_ctrl *ctrl = container_of(work, struct nvme_loop_ctrl *ctrl = container_of(work,
struct nvme_loop_ctrl, reset_work); struct nvme_loop_ctrl, reset_work);
bool changed; bool changed;
int i, ret; int ret;
nvme_loop_shutdown_ctrl(ctrl); nvme_loop_shutdown_ctrl(ctrl);
@ -502,11 +515,9 @@ static void nvme_loop_reset_ctrl_work(struct work_struct *work)
if (ret) if (ret)
goto out_destroy_admin; goto out_destroy_admin;
for (i = 1; i < ctrl->queue_count; i++) { ret = nvme_loop_connect_io_queues(ctrl);
ret = nvmf_connect_io_queue(&ctrl->ctrl, i); if (ret)
if (ret) goto out_destroy_io;
goto out_destroy_io;
}
changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE); changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);
WARN_ON_ONCE(!changed); WARN_ON_ONCE(!changed);
@ -559,7 +570,7 @@ static const struct nvme_ctrl_ops nvme_loop_ctrl_ops = {
static int nvme_loop_create_io_queues(struct nvme_loop_ctrl *ctrl) static int nvme_loop_create_io_queues(struct nvme_loop_ctrl *ctrl)
{ {
int ret, i; int ret;
ret = nvme_loop_init_io_queues(ctrl); ret = nvme_loop_init_io_queues(ctrl);
if (ret) if (ret)
@ -588,11 +599,9 @@ static int nvme_loop_create_io_queues(struct nvme_loop_ctrl *ctrl)
goto out_free_tagset; goto out_free_tagset;
} }
for (i = 1; i < ctrl->queue_count; i++) { ret = nvme_loop_connect_io_queues(ctrl);
ret = nvmf_connect_io_queue(&ctrl->ctrl, i); if (ret)
if (ret) goto out_cleanup_connect_q;
goto out_cleanup_connect_q;
}
return 0; return 0;