From: Nicholas Bellinger Date: Wed, 2 Mar 2011 23:52:51 +0000 (-0800) Subject: [SCSI] target: Fix volume size misreporting for volumes > 2TB X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=904f0bc482201fa86e75c330d79dfd11be494cf8;p=linux-beck.git [SCSI] target: Fix volume size misreporting for volumes > 2TB the target infrastructure fails to send the correct conventional size to READ_CAPACITY that force a retry with READ_CAPACITY_16, which reads the capacity for devices > 2TB. Fix by adding the correct return to trigger RC(16). Reported-by: Ben Jarvis Signed-off-by: Signed-off-by: Nicholas A. Bellinger Cc: stable@kernel.org Signed-off-by: James Bottomley --- diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c index 366080baf474..7f19c8b7b84c 100644 --- a/drivers/target/target_core_cdb.c +++ b/drivers/target/target_core_cdb.c @@ -667,7 +667,13 @@ target_emulate_readcapacity(struct se_cmd *cmd) { struct se_device *dev = SE_DEV(cmd); unsigned char *buf = cmd->t_task->t_task_buf; - u32 blocks = dev->transport->get_blocks(dev); + unsigned long long blocks_long = dev->transport->get_blocks(dev); + u32 blocks; + + if (blocks_long >= 0x00000000ffffffff) + blocks = 0xffffffff; + else + blocks = (u32)blocks_long; buf[0] = (blocks >> 24) & 0xff; buf[1] = (blocks >> 16) & 0xff;