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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-01-05 13:58:03 -08:00
parent a9a08aa2cf a77563897a
commit 96ed78c9b5
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scst/src/scst_lib.c
View File

@@ -8520,17 +8520,20 @@ static void scsi_end_async(struct request *req, blk_status_t error)
lockdep_assert_held(req->q->queue_lock);
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
result = scsi_req(req)->result;
#else
result = req->errors;
#endif
result = result && !IS_ERR_VALUE((long)result) ? result :
IS_ERR_VALUE((long)result) || error ?
SAM_STAT_CHECK_CONDITION : 0;
if (sioc->done) {
int resid_len;
long result;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
result = scsi_req(req)->result;
#else
result = req->errors;
#endif
TRACE_DBG("error %d / %ld", error, result);
result = result && !IS_ERR_VALUE(result) ? result :
IS_ERR_VALUE(result) || error ?
SAM_STAT_CHECK_CONDITION : 0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
resid_len = scsi_req(req)->resid_len;

2
scst/src/scst_main.c
View File

@@ -1533,7 +1533,7 @@ out:
return res;
out_unreg:
list_del(&dev->dev_list_entry);
list_del_init(&dev->dev_list_entry);
scst_assign_dev_handler(dev, &scst_null_devtype);
goto out_pr_clear_dev;