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

Cleanup

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4543 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2012-10-02 18:57:35 +00:00
parent 5f94cac0df
commit bcc9ad6381
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/include/scst.h
+2 -3
View File
@@ -2034,7 +2034,7 @@ struct scst_cmd {
int expected_transfer_len;
int expected_out_transfer_len; /* for bidi writes */
int64_t lba; /* LBA of this cmd in blocks */
int64_t lba; /* LBA of this cmd */
/*
* Cmd data length. Could be different from bufflen for commands like
@@ -4418,9 +4418,8 @@ int scst_scsi_exec_async(struct scst_cmd *cmd, void *data,
#endif
struct scst_data_descriptor {
/* Both fields in blocks */
uint64_t sdd_lba;
uint64_t sdd_len;
uint64_t sdd_blocks;
};
void scst_write_same(struct scst_cmd *cmd);
scst/src/dev_handlers/scst_vdisk.c
+17 -17
View File
@@ -1886,9 +1886,8 @@ static uint64_t vdisk_gen_dev_id_num(const char *virt_dev_name)
#endif
}
/* start and len in blocks */
static int vdisk_unmap_range(struct scst_cmd *cmd,
struct scst_vdisk_dev *virt_dev, uint64_t start, uint32_t len)
struct scst_vdisk_dev *virt_dev, uint64_t start_lba, uint32_t blocks)
{
int res, err;
struct file *fd = virt_dev->fd;
@@ -1896,11 +1895,11 @@ static int vdisk_unmap_range(struct scst_cmd *cmd,
TRACE_ENTRY();
if (len == 0)
if (blocks == 0)
goto success;
if ((start > virt_dev->nblocks) ||
((start + len) > virt_dev->nblocks)) {
if ((start_lba > virt_dev->nblocks) ||
((start_lba + blocks) > virt_dev->nblocks)) {
PRINT_ERROR("Device %s: attempt to write beyond max "
"size", virt_dev->name);
scst_set_cmd_error(cmd,
@@ -1910,28 +1909,28 @@ static int vdisk_unmap_range(struct scst_cmd *cmd,
}
TRACE_DBG("Unmapping lba %lld (blocks %lld)",
(unsigned long long)start, (unsigned long long)len);
(unsigned long long)start_lba, (unsigned long long)blocks);
if (virt_dev->blockio) {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27)
gfp_t gfp = scst_cmd_get_gfp_flags(cmd);
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 31)
err = blkdev_issue_discard(inode->i_bdev, start, len, gfp);
err = blkdev_issue_discard(inode->i_bdev, start_lba, blocks, gfp);
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) \
&& !(LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 34) \
&& defined(CONFIG_SUSE_KERNEL))
err = blkdev_issue_discard(inode->i_bdev, start, len,
err = blkdev_issue_discard(inode->i_bdev, start_lba, blocks,
gfp, DISCARD_FL_WAIT);
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37)
err = blkdev_issue_discard(inode->i_bdev, start, len,
err = blkdev_issue_discard(inode->i_bdev, start_lba, blocks,
gfp, BLKDEV_IFL_WAIT);
#else
err = blkdev_issue_discard(inode->i_bdev, start, len, gfp, 0);
err = blkdev_issue_discard(inode->i_bdev, start_lba, blocks, gfp, 0);
#endif
if (unlikely(err != 0)) {
PRINT_ERROR("blkdev_issue_discard() for "
"LBA %lld len %d failed: %d",
(unsigned long long)start, len, err);
"LBA %lld, blocks %d failed: %d",
(unsigned long long)start_lba, blocks, err);
scst_set_cmd_error(cmd,
SCST_LOAD_SENSE(scst_sense_write_error));
res = -EIO;
@@ -1946,8 +1945,8 @@ static int vdisk_unmap_range(struct scst_cmd *cmd,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
struct scst_device *dev = cmd->dev;
const int block_shift = dev->block_shift;
const loff_t s = start << block_shift;
const loff_t l = len << block_shift;
const loff_t s = start_lba << block_shift;
const loff_t l = blocks << block_shift;
TRACE_DBG("Fallocating range %lld, len %lld",
(unsigned long long)s, (unsigned long long)l);
@@ -1956,8 +1955,8 @@ static int vdisk_unmap_range(struct scst_cmd *cmd,
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, s, l);
if (unlikely(err != 0)) {
PRINT_ERROR("fallocate() for LBA %lld len %lld "
"failed: %d", (unsigned long long)start,
(unsigned long long)len, err);
"failed: %d", (unsigned long long)start_lba,
(unsigned long long)blocks, err);
scst_set_cmd_error(cmd,
SCST_LOAD_SENSE(scst_sense_write_error));
res = -EIO;
@@ -2070,7 +2069,8 @@ static enum compl_status_e vdisk_exec_unmap(struct vdisk_cmd_params *p)
goto out;
}
rc = vdisk_unmap_range(cmd, virt_dev, pd[i].sdd_lba, pd[i].sdd_len);
rc = vdisk_unmap_range(cmd, virt_dev, pd[i].sdd_lba,
pd[i].sdd_blocks);
if (rc != 0)
goto out;
}
scst/src/scst_lib.c
+3 -3
View File
@@ -8668,10 +8668,10 @@ static int scst_parse_unmap_descriptors(struct scst_cmd *cmd)
struct scst_data_descriptor *d = &pd[i];
d->sdd_lba = get_unaligned_be64(&address[offset]);
offset += 8;
d->sdd_len = get_unaligned_be32(&address[offset]);
d->sdd_blocks = get_unaligned_be32(&address[offset]);
offset += 8;
TRACE_DBG("i %d, lba %lld, len %lld", i,
(long long)d->sdd_lba, (long long)d->sdd_len);
TRACE_DBG("i %d, lba %lld, blocks %lld", i,
(long long)d->sdd_lba, (long long)d->sdd_blocks);
i++;
}