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

scst_vdisk, thin provisioning: unmap the largest range possible even if the

Browse Source 
upper bound of the range is not a multiple of PAGE_CACHE_SIZE. This is a
follow-up for r3799 and removes the PRINT_ERROR() statement introduced in that
revision.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3844 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2011-09-07 18:52:46 +00:00
parent b5865c7969
commit bde71b8cff
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1381,21 +1381,26 @@ static void vdisk_exec_unmap(struct scst_cmd *cmd, struct scst_vdisk_thr *thr)
#endif
} else {
const int block_shift = virt_dev->block_shift;
const loff_t a0 = start << block_shift;
const loff_t a2 = (start + len) << block_shift;
const loff_t a1 = max_t(loff_t, a2 & PAGE_CACHE_MASK,
a0);
/*
* We are guaranteed by thin_provisioned flag
* that truncate_range is not NULL.
* The SCSI UNMAP command discards a range of blocks
* of size (1 << block_shift) while the Linux VFS
* truncate_range() function discards a range of blocks
* of size PAGE_CACHE_SIZE. Hence pass range [a0, a1)
* to truncate_range() instead of range [a0,
* a2). Note: since we do not set TPRZ it is not
* necessary to overwrite the range [a1, a2) with
* zeroes.
*/
if (((start + len) << block_shift) &
(PAGE_CACHE_SIZE - 1)) {
PRINT_ERROR("Invalid UNMAP range [%llu, %llu); "
"block size = %d", start, start + len,
virt_dev->block_size);
goto out_put;
}
inode->i_op->truncate_range(inode,
start << block_shift,
((start + len) << block_shift) - 1);
WARN_ON(!(a0 <= a1 && a1 <= a2));
WARN_ON(!((a1 & (PAGE_CACHE_SIZE - 1)) == 0 ||
a0 == a1));
if (a0 < a1)
inode->i_op->truncate_range(inode, a0, a1 - 1);
}
}