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

Minor fixes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1634 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-04-20 18:42:18 +00:00
parent d27d945c4f
commit 88030d3b1f
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/dev_handlers/scst_vdisk.c
+22 -1
View File
@@ -39,6 +39,7 @@
#include <linux/sched.h>
#include <linux/version.h>
#include <asm/div64.h>
#include <asm/unaligned.h>
#define LOG_PREFIX "dev_vdisk"
@@ -1940,7 +1941,17 @@ static void vdisk_exec_read_capacity(struct scst_cmd *cmd)
blocksize = virt_dev->block_size;
nblocks = virt_dev->nblocks;
/* last block on the virt_dev is (nblocks-1) */
if ((cmd->cdb[8] & 1) == 0) {
uint64_t lba = be64_to_cpu(get_unaligned((uint64_t *)&cmd->cdb[2]));
if (lba != 0) {
TRACE_DBG("PMI zero and LBA not zero (cmd %p)", cmd);
scst_set_cmd_error(cmd,
SCST_LOAD_SENSE(scst_sense_invalid_field_in_cdb));
goto out;
}
}
/* Last block on the virt_dev is (nblocks-1) */
memset(buffer, 0, sizeof(buffer));
if (nblocks >> 32) {
buffer[0] = 0xFF;
@@ -1997,6 +2008,16 @@ static void vdisk_exec_read_capacity16(struct scst_cmd *cmd)
blocksize = virt_dev->block_size;
nblocks = virt_dev->nblocks - 1;
if ((cmd->cdb[14] & 1) == 0) {
uint64_t lba = be64_to_cpu(get_unaligned((uint64_t *)&cmd->cdb[2]));
if (lba != 0) {
TRACE_DBG("PMI zero and LBA not zero (cmd %p)", cmd);
scst_set_cmd_error(cmd,
SCST_LOAD_SENSE(scst_sense_invalid_field_in_cdb));
goto out;
}
}
memset(buffer, 0, sizeof(buffer));
buffer[0] = nblocks >> 56;