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

scst_vdisk: Avoid that invalid data is returned for VPD page 0xb0 if

Browse Source 
vdev_blockio_get_unmap_params() fails.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4301 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-05-15 18:38:35 +00:00
parent 44978416d4
commit 363e1b5a05
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/dev_handlers/scst_vdisk.c
+15 -19
View File
@@ -2282,31 +2282,27 @@ static enum compl_status_e vdisk_exec_inquiry(struct vdisk_cmd_params *p)
max_transfer, 512*1024 / dev->block_size),
&buf[12]);
if (virt_dev->thin_provisioned) {
uint32_t gran = 1, align = 0, max_lba = 1;
/* MAXIMUM UNMAP BLOCK DESCRIPTOR COUNT is UNLIMITED */
put_unaligned_be32(0xFFFFFFFF, &buf[24]);
if (virt_dev->blockio) {
/*
* OPTIMAL UNMAP GRANULARITY, ALIGNMENT
* and MAXIMUM UNMAP LBA COUNT
*/
uint32_t gran, align, max_lba;
vdev_blockio_get_unmap_params(virt_dev,
&gran, &align, &max_lba);
put_unaligned_be32(max_lba, &buf[20]);
put_unaligned_be32(gran, &buf[28]);
if (align != 0) {
put_unaligned_be32(align,
&buf[32]);
buf[32] |= 0x80;
}
} else {
/* MAXIMUM UNMAP LBA COUNT */
put_unaligned_be32(
min_t(loff_t, 0xFFFFFFFF,
virt_dev->file_size >> dev->block_shift),
&buf[20]);
/* OPTIMAL UNMAP GRANULARITY */
put_unaligned_be32(1, &buf[28]);
max_lba = min_t(loff_t, 0xFFFFFFFFU,
virt_dev->file_size >>
dev->block_shift);
}
/*
* MAXIMUM UNMAP LBA COUNT, OPTIMAL UNMAP
* GRANULARITY and ALIGNMENT
*/
put_unaligned_be32(max_lba, &buf[20]);
put_unaligned_be32(gran, &buf[28]);
if (align != 0) {
put_unaligned_be32(align, &buf[32]);
buf[32] |= 0x80;
}
}
resp_len = buf[3] + 4;