Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 274351
b: refs/heads/master
c: 5bda90c
h: refs/heads/master
i:
  274349: 9847531
  274347: aeb557c
  274343: e745b4f
  274335: 374cf7f
v: v3
  • Loading branch information
Christoph Hellwig authored and Nicholas Bellinger committed Nov 4, 2011
1 parent 5d18057 commit 163ace8
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 141 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d29a5b6acc4b63d4e05ff554509df6fbeaf527cd
refs/heads/master: 5bda90c8f20f0af93375721533f4081a40fa6f41
111 changes: 10 additions & 101 deletions trunk/drivers/target/target_core_cdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <target/target_core_transport.h>
#include <target/target_core_fabric_ops.h>
#include "target_core_ua.h"
#include "target_core_cdb.h"

static void
target_fill_alua_data(struct se_port *port, unsigned char *buf)
Expand Down Expand Up @@ -679,8 +680,7 @@ target_emulate_evpd_00(struct se_cmd *cmd, unsigned char *buf)
return 0;
}

static int
target_emulate_inquiry(struct se_task *task)
int target_emulate_inquiry(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
Expand Down Expand Up @@ -731,8 +731,7 @@ target_emulate_inquiry(struct se_task *task)
return ret;
}

static int
target_emulate_readcapacity(struct se_task *task)
int target_emulate_readcapacity(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
Expand Down Expand Up @@ -768,8 +767,7 @@ target_emulate_readcapacity(struct se_task *task)
return 0;
}

static int
target_emulate_readcapacity_16(struct se_task *task)
int target_emulate_readcapacity_16(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
Expand Down Expand Up @@ -939,8 +937,7 @@ target_modesense_dpofua(unsigned char *buf, int type)
}
}

static int
target_emulate_modesense(struct se_task *task)
int target_emulate_modesense(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
Expand Down Expand Up @@ -1019,8 +1016,7 @@ target_emulate_modesense(struct se_task *task)
return 0;
}

static int
target_emulate_request_sense(struct se_task *task)
int target_emulate_request_sense(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
unsigned char *cdb = cmd->t_task_cdb;
Expand Down Expand Up @@ -1090,8 +1086,7 @@ target_emulate_request_sense(struct se_task *task)
* Used for TCM/IBLOCK and TCM/FILEIO for block/blk-lib.c level discard support.
* Note this is not used for TCM/pSCSI passthrough
*/
static int
target_emulate_unmap(struct se_task *task)
int target_emulate_unmap(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
Expand Down Expand Up @@ -1150,8 +1145,7 @@ target_emulate_unmap(struct se_task *task)
* Used for TCM/IBLOCK and TCM/FILEIO for block/blk-lib.c level discard support.
* Note this is not used for TCM/pSCSI passthrough
*/
static int
target_emulate_write_same(struct se_task *task)
int target_emulate_write_same(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
Expand Down Expand Up @@ -1196,8 +1190,7 @@ target_emulate_write_same(struct se_task *task)
return 0;
}

static int
target_emulate_synchronize_cache(struct se_task *task)
int target_emulate_synchronize_cache(struct se_task *task)
{
struct se_device *dev = task->task_se_cmd->se_dev;

Expand All @@ -1211,97 +1204,13 @@ target_emulate_synchronize_cache(struct se_task *task)
return 0;
}

static int
target_emulate_noop(struct se_task *task)
int target_emulate_noop(struct se_task *task)
{
task->task_scsi_status = GOOD;
transport_complete_task(task, 1);
return 0;
}

int
transport_emulate_control_cdb(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
unsigned short service_action;
int ret = 0;

switch (cmd->t_task_cdb[0]) {
case INQUIRY:
ret = target_emulate_inquiry(task);
break;
case READ_CAPACITY:
ret = target_emulate_readcapacity(task);
break;
case MODE_SENSE:
ret = target_emulate_modesense(task);
break;
case MODE_SENSE_10:
ret = target_emulate_modesense(task);
break;
case SERVICE_ACTION_IN:
switch (cmd->t_task_cdb[1] & 0x1f) {
case SAI_READ_CAPACITY_16:
ret = target_emulate_readcapacity_16(task);
break;
default:
pr_err("Unsupported SA: 0x%02x\n",
cmd->t_task_cdb[1] & 0x1f);
return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
}
break;
case REQUEST_SENSE:
ret = target_emulate_request_sense(task);
break;
case UNMAP:
ret = target_emulate_unmap(task);
break;
case WRITE_SAME:
ret = target_emulate_write_same(task);
break;
case WRITE_SAME_16:
ret = target_emulate_write_same(task);
break;
case VARIABLE_LENGTH_CMD:
service_action =
get_unaligned_be16(&cmd->t_task_cdb[8]);
switch (service_action) {
case WRITE_SAME_32:
ret = target_emulate_write_same(task);
break;
default:
pr_err("Unsupported VARIABLE_LENGTH_CMD SA:"
" 0x%02x\n", service_action);
break;
}
break;
case SYNCHRONIZE_CACHE:
case 0x91: /* SYNCHRONIZE_CACHE_16: */
ret = target_emulate_synchronize_cache(task);
break;
case ALLOW_MEDIUM_REMOVAL:
case ERASE:
case REZERO_UNIT:
case SEEK_10:
case SPACE:
case START_STOP:
case TEST_UNIT_READY:
case VERIFY:
case WRITE_FILEMARKS:
ret = target_emulate_noop(task);
break;
default:
pr_err("Unsupported SCSI Opcode: 0x%02x for %s\n",
cmd->t_task_cdb[0], dev->transport->name);
return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
}

if (ret < 0)
return ret;
return PYX_TRANSPORT_SENT_TO_TRANSPORT;
}

/*
* Write a CDB into @cdb that is based on the one the intiator sent us,
* but updated to only cover the sectors that the current task handles.
Expand Down
14 changes: 14 additions & 0 deletions trunk/drivers/target/target_core_cdb.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#ifndef TARGET_CORE_CDB_H
#define TARGET_CORE_CDB_H

int target_emulate_inquiry(struct se_task *task);
int target_emulate_readcapacity(struct se_task *task);
int target_emulate_readcapacity_16(struct se_task *task);
int target_emulate_modesense(struct se_task *task);
int target_emulate_request_sense(struct se_task *task);
int target_emulate_unmap(struct se_task *task);
int target_emulate_write_same(struct se_task *task);
int target_emulate_synchronize_cache(struct se_task *task);
int target_emulate_noop(struct se_task *task);

#endif /* TARGET_CORE_CDB_H */
Loading

0 comments on commit 163ace8

Please sign in to comment.