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

scst_alloc() didn't set len of the last sg entry as reported by ido benda <idombd@gmail.com> + set resid_possible for special cases of LUN NOT SUPPORTED

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2673 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-11-11 19:55:52 +00:00
parent d99565f6fb
commit fc3dec251d
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scst/src/scst_lib.c
View File

@@ -886,6 +886,7 @@ go:
res = 0;
cmd->completed = 1;
cmd->resid_possible = 1;
out:
TRACE_EXIT_RES(res);
@@ -957,6 +958,7 @@ go:
res = 0;
cmd->completed = 1;
cmd->resid_possible = 1;
out:
TRACE_EXIT_RES(res);

14
scst/src/scst_mem.c
View File

@@ -1254,6 +1254,7 @@ struct scatterlist *scst_alloc(int size, gfp_t gfp_mask, int *count)
struct sgv_pool_alloc_fns sys_alloc_fns = {
sgv_alloc_sys_pages, sgv_free_sys_sg_entries };
int no_fail = ((gfp_mask & __GFP_NOFAIL) == __GFP_NOFAIL);
int cnt;
TRACE_ENTRY();
@@ -1285,15 +1286,20 @@ struct scatterlist *scst_alloc(int size, gfp_t gfp_mask, int *count)
/*
* If we allow use clustering here, we will have troubles in
* scst_free() to figure out how many pages are in the SG vector.
* So, always don't use clustering.
* So, let's always don't use clustering.
*/
*count = sgv_alloc_sg_entries(res, pages, gfp_mask, sgv_no_clustering,
cnt = sgv_alloc_sg_entries(res, pages, gfp_mask, sgv_no_clustering,
NULL, &sys_alloc_fns, NULL);
if (*count <= 0)
if (cnt <= 0)
goto out_free;
if (size & ~PAGE_MASK)
res[cnt-1].length -= PAGE_SIZE - (size & ~PAGE_MASK);
*count = cnt;
out:
TRACE_MEM("Alloced sg %p (count %d) \"no fail\" %d", res, *count, no_fail);
TRACE_MEM("Alloced sg %p (count %d, no_fail %d)", res, *count, no_fail);
TRACE_EXIT_HRES(res);
return res;