scsi: return blk_status_t from scsi_init_io and ->init_command
Replace the old BLKPREP_* values with the BLK_STS_ ones that they are converted to later anyway. Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:

committed by
Jens Axboe

parent
14784565f7
commit
159b2cbf59
@@ -171,7 +171,7 @@ extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
|
||||
size_t *offset, size_t *len);
|
||||
extern void scsi_kunmap_atomic_sg(void *virt);
|
||||
|
||||
extern int scsi_init_io(struct scsi_cmnd *cmd);
|
||||
extern blk_status_t scsi_init_io(struct scsi_cmnd *cmd);
|
||||
|
||||
#ifdef CONFIG_SCSI_DMA
|
||||
extern int scsi_dma_map(struct scsi_cmnd *cmd);
|
||||
|
@@ -2,6 +2,7 @@
|
||||
#ifndef _SCSI_SCSI_DRIVER_H
|
||||
#define _SCSI_SCSI_DRIVER_H
|
||||
|
||||
#include <linux/blk_types.h>
|
||||
#include <linux/device.h>
|
||||
|
||||
struct module;
|
||||
@@ -13,7 +14,7 @@ struct scsi_driver {
|
||||
struct device_driver gendrv;
|
||||
|
||||
void (*rescan)(struct device *);
|
||||
int (*init_command)(struct scsi_cmnd *);
|
||||
blk_status_t (*init_command)(struct scsi_cmnd *);
|
||||
void (*uninit_command)(struct scsi_cmnd *);
|
||||
int (*done)(struct scsi_cmnd *);
|
||||
int (*eh_action)(struct scsi_cmnd *, int);
|
||||
|
Reference in New Issue
Block a user