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

iscsi initiator: remove the deleted variable.

Browse Source 
I do not think that this variable is needed.
The rpc system will be always executed in the first
call, so there is no sync issue, add a deleted variable
and put the free in the loop sounds not very clear.

For the ASAN issue (use req after free), I think
that the correct solution is that: we should store
the context first instead of defer the free of req.

Change-Id: I49ca2708ddc2c5533bb3a0aee4622ae23bfe47c6
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/414726
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Ziye Yang 2018-06-12 10:42:01 +08:00 committed by Changpeng Liu
parent 7efc7b8302
commit 4f47c066c9
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,6 @@ struct bdev_iscsi_conn_req {
spdk_bdev_iscsi_create_cb create_cb; spdk_bdev_iscsi_create_cb create_cb;
spdk_bdev_iscsi_create_cb create_cb_arg; spdk_bdev_iscsi_create_cb create_cb_arg;
TAILQ_ENTRY(bdev_iscsi_conn_req) link; TAILQ_ENTRY(bdev_iscsi_conn_req) link;
bool deleted;
}; };
static int static int
@ -537,7 +536,7 @@ complete_conn_req(struct bdev_iscsi_conn_req *req, struct spdk_bdev *bdev,
{ {
TAILQ_REMOVE(&g_iscsi_conn_req, req, link); TAILQ_REMOVE(&g_iscsi_conn_req, req, link);
req->create_cb(req->create_cb_arg, bdev, status); req->create_cb(req->create_cb_arg, bdev, status);
req->deleted = true; free(req);
} }
static int static int
@ -646,10 +645,12 @@ iscsi_bdev_conn_poll(void *arg)
{ {
struct bdev_iscsi_conn_req *req, *tmp; struct bdev_iscsi_conn_req *req, *tmp;
struct pollfd pfd; struct pollfd pfd;
struct iscsi_context *context;
TAILQ_FOREACH_SAFE(req, &g_iscsi_conn_req, link, tmp) { TAILQ_FOREACH_SAFE(req, &g_iscsi_conn_req, link, tmp) {
pfd.fd = iscsi_get_fd(req->context); context = req->context;
pfd.events = iscsi_which_events(req->context); pfd.fd = iscsi_get_fd(context);
pfd.events = iscsi_which_events(context);
pfd.revents = 0; pfd.revents = 0;
if (poll(&pfd, 1, 0) < 0) { if (poll(&pfd, 1, 0) < 0) {
SPDK_ERRLOG("poll failed\n"); SPDK_ERRLOG("poll failed\n");
@ -657,14 +658,10 @@ iscsi_bdev_conn_poll(void *arg)
} }
if (pfd.revents != 0) { if (pfd.revents != 0) {
if (iscsi_service(req->context, pfd.revents) < 0) { if (iscsi_service(context, pfd.revents) < 0) {
SPDK_ERRLOG("iscsi_service failed: %s\n", iscsi_get_error(req->context)); SPDK_ERRLOG("iscsi_service failed: %s\n", iscsi_get_error(context));
} }
} }
if (req->deleted) {
free(req);
}
} }
return -1; return -1;