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

Limit max unmap LBA count to device size

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3886 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2011-10-05 02:08:51 +00:00
parent 9118d7c71f
commit fdce259c4f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1425,7 +1425,7 @@ static void vdev_blockio_get_unmap_params(struct scst_vdisk_dev *virt_dev,
*unmap_gran = 1;
*unmap_alignment = 0;
*max_unmap_lba = 0xFFFFFFFF;
*max_unmap_lba = min_t(loff_t, 0xFFFFFFFF, virt_dev->file_size >> virt_dev->block_shift);
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) || (defined(RHEL_MAJOR) && RHEL_MAJOR -0 >= 6)
fd = filp_open(virt_dev->filename, O_LARGEFILE, 0600);
@@ -1642,7 +1642,8 @@ static void vdisk_exec_inquiry(struct scst_cmd *cmd)
if (virt_dev->blockio) {
/*
* OPTIMAL UNMAP GRANULARITY, ALIGNMENT
* and MAXIMUM UNMAP LBA COUNT */
* and MAXIMUM UNMAP LBA COUNT
*/
uint32_t gran, align, max_lba;
vdev_blockio_get_unmap_params(virt_dev,
&gran, &align, &max_lba);
@@ -1656,10 +1657,12 @@ static void vdisk_exec_inquiry(struct scst_cmd *cmd)
buf[32] |= 0x80;
}
} else {
/* MAXIMUM UNMAP LBA COUNT is UNLIMITED */
put_unaligned(cpu_to_be32(0xFFFFFFFF),
(uint32_t *)&buf[20]);
/* OPTIMAL UNMAP GRANULARITY is 1 */
/* MAXIMUM UNMAP LBA COUNT */
put_unaligned(cpu_to_be32(
min_t(loff_t, 0xFFFFFFFF,
virt_dev->file_size >> virt_dev->block_shift)),
(uint32_t *)&buf[20]);
/* OPTIMAL UNMAP GRANULARITY */
put_unaligned(cpu_to_be32(1),
(uint32_t *)&buf[28]);
}