redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

scsi: restructure command initialization for TYPE_FS requests 

We should call the device handler prep_fn for all TYPE_FS requests,
not just simple read/write calls that are handled by the disk driver.

Restructure the common I/O code to call the prep_fn handler and zero
out the CDB, and just leave the call to scsi_init_io to the ULDs.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
hifive-unleashed-5.1
Christoph Hellwig 2014-06-28 11:58:42 +02:00
parent 635d98b1d0
commit 3868cf8ea7
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/scsi/scsi_lib.c
View File

@ -1082,11 +1082,10 @@ int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)
EXPORT_SYMBOL(scsi_setup_blk_pc_cmnd);
/*
* Setup a REQ_TYPE_FS command. These are simple read/write request
* from filesystems that still need to be translated to SCSI CDBs from
* the ULD.
* Setup a REQ_TYPE_FS command. These are simple request from filesystems
* that still need to be translated to SCSI CDBs from the ULD.
*/
int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req)
static int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req)
{
struct scsi_cmnd *cmd = req->special;
@ -1098,9 +1097,8 @@ int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req)
}
memset(cmd->cmnd, 0, BLK_MAX_CDB);
return scsi_init_io(cmd, GFP_ATOMIC);
return scsi_cmd_to_driver(cmd)->init_command(cmd);
}
EXPORT_SYMBOL(scsi_setup_fs_cmnd);
static int
scsi_prep_state_check(struct scsi_device *sdev, struct request *req)
@ -1205,12 +1203,16 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
goto out;
}
if (req->cmd_type == REQ_TYPE_FS)
ret = scsi_cmd_to_driver(cmd)->init_command(cmd);
else if (req->cmd_type == REQ_TYPE_BLOCK_PC)
switch (req->cmd_type) {
case REQ_TYPE_FS:
ret = scsi_setup_fs_cmnd(sdev, req);
break;
case REQ_TYPE_BLOCK_PC:
ret = scsi_setup_blk_pc_cmnd(sdev, req);
else
break;
default:
ret = BLKPREP_KILL;
}
out:
return scsi_prep_return(q, req, ret);

2
drivers/scsi/sd.c
View File

@ -894,7 +894,7 @@ static int sd_init_command(struct scsi_cmnd *SCpnt)
ret = scsi_setup_flush_cmnd(sdp, rq);
goto out;
}
ret = scsi_setup_fs_cmnd(sdp, rq);
ret = scsi_init_io(SCpnt, GFP_ATOMIC);
if (ret != BLKPREP_OK)
goto out;
SCpnt = rq->special;

3
drivers/scsi/sr.c
View File

@ -385,10 +385,9 @@ static int sr_init_command(struct scsi_cmnd *SCpnt)
int block = 0, this_count, s_size;
struct scsi_cd *cd;
struct request *rq = SCpnt->request;
struct scsi_device *sdp = SCpnt->device;
int ret;
ret = scsi_setup_fs_cmnd(sdp, rq);
ret = scsi_init_io(SCpnt, GFP_ATOMIC);
if (ret != BLKPREP_OK)
goto out;
SCpnt = rq->special;

1
include/scsi/scsi_driver.h
View File

@ -30,6 +30,5 @@ extern int scsi_register_interface(struct class_interface *);
class_interface_unregister(intf)
int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req);
int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req);
#endif /* _SCSI_SCSI_DRIVER_H */