ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/iscsi: break out common code for completing a conn_req

Browse Source 
Suggested-by: Ziye Yang
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I6ca7f08aed2e12c59518269c7b277895b4817bd8

Reviewed-on: https://review.gerrithub.io/413844
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Jim Harris 2018-06-05 03:53:53 -07:00 committed by Daniel Verkamp
parent e83a62bf09
commit c796b90747
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/bdev/iscsi/bdev_iscsi.c
View File

@ -467,6 +467,15 @@ static const struct spdk_bdev_fn_table iscsi_fn_table = {
.write_config_json = bdev_iscsi_write_config_json, .write_config_json = bdev_iscsi_write_config_json,
}; };
static void
complete_conn_req(struct bdev_iscsi_conn_req *req, struct spdk_bdev *bdev,
int status)
{
TAILQ_REMOVE(&g_iscsi_conn_req, req, link);
req->create_cb(req->create_cb_arg, bdev, status);
req->deleted = true;
}
static int static int
create_iscsi_lun(struct iscsi_context *context, char *url, char *initiator_iqn, char *name, create_iscsi_lun(struct iscsi_context *context, char *url, char *initiator_iqn, char *name,
uint64_t num_blocks, uint32_t block_size, struct spdk_bdev **bdev) uint64_t num_blocks, uint32_t block_size, struct spdk_bdev **bdev)
@ -539,10 +548,8 @@ iscsi_readcapacity16_cb(struct iscsi_context *iscsi, int status,
} }
ret: ret:
TAILQ_REMOVE(&g_iscsi_conn_req, req, link);
req->create_cb(req->create_cb_arg, bdev, status);
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
req->deleted = true; complete_conn_req(req, bdev, status);
} }
static void static void
@ -563,9 +570,7 @@ iscsi_connect_cb(struct iscsi_context *iscsi, int status,
ret: ret:
SPDK_ERRLOG("iSCSI error: %s\n", iscsi_get_error(req->context)); SPDK_ERRLOG("iSCSI error: %s\n", iscsi_get_error(req->context));
TAILQ_REMOVE(&g_iscsi_conn_req, req, link); complete_conn_req(req, NULL, status);
req->create_cb(req->create_cb_arg, NULL, status);
req->deleted = true;
} }
static int static int