mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
sd, sr: fix Driver 'sd' needs updating message
If a SCSI ULD driver sets blk_queue_prep_rq(), it should clean it up itself on remove(), and not from the bus callbacks. This removes the need to hook into bus->remove(), which should not be used at the same time as driver->remove(). [jejb: fix sdkp initialisation problem due to mismerge] Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
24add1c432
commit
b391277a56
@ -1207,6 +1207,7 @@ int scsi_prep_fn(struct request_queue *q, struct request *req)
|
||||
ret = scsi_setup_blk_pc_cmnd(sdev, req);
|
||||
return scsi_prep_return(q, req, ret);
|
||||
}
|
||||
EXPORT_SYMBOL(scsi_prep_fn);
|
||||
|
||||
/*
|
||||
* scsi_dev_queue_ready: if we can send requests to sdev, return 1 else
|
||||
|
@ -87,7 +87,6 @@ extern int scsi_init_queue(void);
|
||||
extern void scsi_exit_queue(void);
|
||||
struct request_queue;
|
||||
struct request;
|
||||
extern int scsi_prep_fn(struct request_queue *, struct request *);
|
||||
extern struct kmem_cache *scsi_sdb_cache;
|
||||
|
||||
/* scsi_proc.c */
|
||||
|
@ -420,29 +420,12 @@ static int scsi_bus_resume(struct device * dev)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int scsi_bus_remove(struct device *dev)
|
||||
{
|
||||
struct device_driver *drv = dev->driver;
|
||||
struct scsi_device *sdev = to_scsi_device(dev);
|
||||
int err = 0;
|
||||
|
||||
/* reset the prep_fn back to the default since the
|
||||
* driver may have altered it and it's being removed */
|
||||
blk_queue_prep_rq(sdev->request_queue, scsi_prep_fn);
|
||||
|
||||
if (drv && drv->remove)
|
||||
err = drv->remove(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct bus_type scsi_bus_type = {
|
||||
.name = "scsi",
|
||||
.match = scsi_bus_match,
|
||||
.uevent = scsi_bus_uevent,
|
||||
.suspend = scsi_bus_suspend,
|
||||
.resume = scsi_bus_resume,
|
||||
.remove = scsi_bus_remove,
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(scsi_bus_type);
|
||||
|
||||
|
@ -2123,6 +2123,7 @@ static int sd_remove(struct device *dev)
|
||||
|
||||
async_synchronize_full();
|
||||
sdkp = dev_get_drvdata(dev);
|
||||
blk_queue_prep_rq(sdkp->device->request_queue, scsi_prep_fn);
|
||||
device_del(&sdkp->dev);
|
||||
del_gendisk(sdkp->disk);
|
||||
sd_shutdown(dev);
|
||||
|
@ -881,6 +881,7 @@ static int sr_remove(struct device *dev)
|
||||
{
|
||||
struct scsi_cd *cd = dev_get_drvdata(dev);
|
||||
|
||||
blk_queue_prep_rq(cd->device->request_queue, scsi_prep_fn);
|
||||
del_gendisk(cd->disk);
|
||||
|
||||
mutex_lock(&sr_ref_mutex);
|
||||
|
@ -32,5 +32,6 @@ 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);
|
||||
int scsi_prep_state_check(struct scsi_device *sdev, struct request *req);
|
||||
int scsi_prep_return(struct request_queue *q, struct request *req, int ret);
|
||||
int scsi_prep_fn(struct request_queue *, struct request *);
|
||||
|
||||
#endif /* _SCSI_SCSI_DRIVER_H */
|
||||
|
Loading…
Reference in New Issue
Block a user