mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 20:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r5837 from the iser branch

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6273 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-11 16:39:35 +00:00
parent c012f4e2f1
commit 7f1700e263
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
iscsi-scst/kernel/iscsi.c
View File

@@ -65,6 +65,7 @@ static void cmnd_remove_data_wait_hash(struct iscsi_cmnd *cmnd);
static void iscsi_send_task_mgmt_resp(struct iscsi_cmnd *req, int status,
bool dropped);
static void iscsi_check_send_delayed_tm_resp(struct iscsi_session *sess);
static void req_cmnd_release(struct iscsi_cmnd *req);
static int cmnd_insert_data_wait_hash(struct iscsi_cmnd *cmnd);
static void iscsi_cmnd_init_write(struct iscsi_cmnd *rsp, int flags);
static void iscsi_set_resid_no_scst_cmd(struct iscsi_cmnd *rsp);
@@ -643,6 +644,7 @@ out:
TRACE_EXIT();
return;
}
EXPORT_SYMBOL(req_cmnd_release_force);
void req_cmnd_pre_release(struct iscsi_cmnd *req)
{
@@ -710,7 +712,7 @@ EXPORT_SYMBOL(req_cmnd_pre_release);
* Corresponding conn may also get destroyed after this function, except only
* if it's called from the read thread!
*/
void req_cmnd_release(struct iscsi_cmnd *req)
static void req_cmnd_release(struct iscsi_cmnd *req)
{
TRACE_ENTRY();
@@ -720,7 +722,6 @@ void req_cmnd_release(struct iscsi_cmnd *req)
TRACE_EXIT();
return;
}
EXPORT_SYMBOL(req_cmnd_release);
/*
* Corresponding conn may also get destroyed after this function, except only

1
iscsi-scst/kernel/iscsi.h
View File

@@ -853,7 +853,6 @@ extern void iscsi_set_resid(struct iscsi_cmnd *rsp);
extern int iscsi_init_conn(struct iscsi_session *session,
struct iscsi_kern_conn_info *info, struct iscsi_conn *conn);
extern void req_cmnd_pre_release(struct iscsi_cmnd *req);
extern void req_cmnd_release(struct iscsi_cmnd *req);
extern struct iscsi_cmnd *create_status_rsp(struct iscsi_cmnd *req,
int status, const u8 *sense_buf, int sense_len);
extern int iscsi_cmnd_set_write_buf(struct iscsi_cmnd *req);

2
iscsi-scst/kernel/isert-scst/isert.c
View File

@@ -366,7 +366,7 @@ void isert_pdu_err(struct iscsi_cmnd *pdu)
* for same PDU with multiple RDMAs case
*/
if (pdu->on_write_timeout_list)
req_cmnd_release(pdu);
req_cmnd_release_force(pdu);
}
}