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

scst: Simplify REPORT TARGET PORT GROUPS implementation

Browse Source 
The value of the variable allocation_length is identical to the value of the
variable buf_len. Hence eliminate the former. Also, for MAINTENANCE(IN)
cdb_len is always equal to 12 so the test "cdb_len > 1" can be eliminated too.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4382 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-06-28 11:28:18 +00:00
parent 26a74cebe8
commit 95bc9b68ff
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -3134,7 +3134,7 @@ static enum compl_status_e vdisk_exec_report_tpgs(struct vdisk_cmd_params *p)
uint8_t *address;
void *buf;
int32_t buf_len;
uint32_t allocation_length, data_length, length;
uint32_t data_length, length;
uint8_t data_format;
int res;
@@ -3154,9 +3154,7 @@ static enum compl_status_e vdisk_exec_report_tpgs(struct vdisk_cmd_params *p)
"least 12 bytes)", cmd->cdb_len);
dev = cmd->dev;
data_format = cmd->cdb_len > 1 ? cmd->cdb[1] >> 5 : 0;
allocation_length = cmd->cdb_len >= 10 ?
get_unaligned_be32(cmd->cdb + 6) : 1024;
data_format = cmd->cdb[1] >> 5;
res = scst_tg_get_group_info(&buf, &data_length, dev, data_format);
if (res == -ENOMEM) {
@@ -3168,7 +3166,7 @@ static enum compl_status_e vdisk_exec_report_tpgs(struct vdisk_cmd_params *p)
goto out_put;
}
length = min_t(uint32_t, min(allocation_length, data_length), buf_len);
length = min_t(uint32_t, data_length, buf_len);
memcpy(address, buf, length);
kfree(buf);
if (length < cmd->resp_data_len)