Driver 'sd' needs updating
PATCH 1/1 Driver 'sd' needs updating
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().
--- drivers/scsi/scsi_lib.c | 1 + drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_sysfs.c | 17 ----------------- drivers/scsi/sd.c | 1 + drivers/scsi/sr.c | 1 + include/scsi/scsi_driver.h | 1 + 6 files changed, 4 insertions(+), 18 deletions(-)
drivers/scsi/scsi_lib.c +1 -0
@@ -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
drivers/scsi/scsi_priv.h +0 -1
@@ -71,7 +71,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 */
drivers/scsi/scsi_sysfs.c +0 -17
@@ -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);
drivers/scsi/sd.c +1 -0
@@ -2053,6 +2053,7 @@ static int sd_remove(struct device *dev)struct scsi_disk *sdkp;async_synchronize_full (); +blk_queue_prep_rq (sdkp->device->request_queue, scsi_prep_fn); sdkp =dev_get_drvdata (dev);device_del (&sdkp->dev);del_gendisk (sdkp->disk);
drivers/scsi/sr.c +1 -0
@@ -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);
include/scsi/scsi_driver.h +1 -0
@@ -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 */
Signature · 1 line
1.5.3.2
James Bottomley
maintainerQuoted 79 lines · Hannes Reinecke
If a SCSI ULD driver sets
blk_queue_prep_rq(), it should clean it up itself onremove(), and not from the bus callbacks. This removes the need to hook intobus->remove(), which should not be used at the same time asdriver->remove().Signed-off-by Hannes Reinecke <[email protected]>Signed-off-by Kay Sievers <[email protected]>--- drivers/scsi/scsi_lib.c | 1 + drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_sysfs.c | 17 ----------------- drivers/scsi/sd.c | 1 + drivers/scsi/sr.c | 1 + include/scsi/scsi_driver.h | 1 + 6 files changed, 4 insertions(+), 18 deletions(-)drivers/scsi/scsi_lib.c +1
-0@@ -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 drivers/scsi/scsi_priv.h +0
-1@@ -71,7 +71,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 */ drivers/scsi/scsi_sysfs.c +0
-17@@ -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);drivers/scsi/sd.c +0
-0
drivers/scsi/sd.c static int sd_remove(struct device *dev) · line 2057
Quoted 5 lines
drivers/scsi/sd.c +1
-0@@ -2053,6 +2053,7 @@ static int sd_remove(struct device *dev)struct scsi_disk *sdkp;async_synchronize_full (); +blk_queue_prep_rq (sdkp->device->request_queue, scsi_prep_fn); sdkp =dev_get_drvdata (dev);
This isn't really going to work ... you're using sdkp before it gets initialised ... did this actually get tested?
James
Quoted 82 lines · James Bottomley
Quoted 81 lines · Hannes Reinecke
If a SCSI ULD driver sets
blk_queue_prep_rq(), it should clean it up itself onremove(), and not from the bus callbacks. This removes the need to hook intobus->remove(), which should not be used at the same time asdriver->remove().Signed-off-by Hannes Reinecke <[email protected]>Signed-off-by Kay Sievers <[email protected]>--- drivers/scsi/scsi_lib.c | 1 + drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_sysfs.c | 17 ----------------- drivers/scsi/sd.c | 1 + drivers/scsi/sr.c | 1 + include/scsi/scsi_driver.h | 1 + 6 files changed, 4 insertions(+), 18 deletions(-)drivers/scsi/scsi_lib.c +1
-0@@ -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 drivers/scsi/scsi_priv.h +0
-1@@ -71,7 +71,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 */ drivers/scsi/scsi_sysfs.c +0
-17@@ -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);drivers/scsi/sd.c +0
-0@@ -2053,6 +2053,7 @@ static int sd_remove(struct device *dev)struct scsi_disk *sdkp;
Quoted 7 lines
drivers/scsi/sd.c static int sd_remove(struct device *dev) · line 2057
Quoted 3 lines
drivers/scsi/sd.c +1
-0async_synchronize_full (); +blk_queue_prep_rq (sdkp->device->request_queue, scsi_prep_fn); sdkp =dev_get_drvdata (dev);This isn't really going to work ... you're using sdkp before it gets initialised ... did this actually get tested?
I have tested the previous iteration heavily. But yes this looks like an uncareful rebase fallout. The last two lines should just be exchanged.
Quoted 2 lines
James
Thanks
Boaz
Quoted 10 lines · Boaz Harrosh
Quoted 9 lines · James Bottomley
Quoted 8 lines · Hannes Reinecke
If a SCSI ULD driver sets
blk_queue_prep_rq(), it should clean it up itself onremove(), and not from the bus callbacks. This removes the need to hook intobus->remove(), which should not be used at the same time asdriver->remove().Signed-off-by Hannes Reinecke <[email protected]>Signed-off-by Kay Sievers <[email protected]>---
<snip>
Quoted 10 lines
Quoted 9 lines
Review static int sd_remove(struct device *dev) · line 2057
Quoted 6 lines
(quoted diff) +1
-0@@ -2053,6 +2053,7 @@ static int sd_remove(struct device *dev) struct scsi_disk *sdkp; async_synchronize_full(); + blk_queue_prep_rq(sdkp->device->request_queue, scsi_prep_fn); sdkp = dev_get_drvdata(dev);This isn't really going to work ... you're using sdkp before it gets initialised ... did this actually get tested?
Quoted 3 lines
I have tested the previous iteration heavily. But yes this looks like an uncareful rebase fallout. The last two lines should just be exchanged.
I have now *tested* with the above blk_queue_prep_rq() call just after the "sdkp = dev_get_drvdata(dev);"
Thanks
Boaz
---
drivers/scsi/sd.c +1 -1
@@ -2053,8 +2053,8 @@ static int sd_remove(struct device *dev)struct scsi_disk *sdkp;async_synchronize_full (); -blk_queue_prep_rq (sdkp->device->request_queue, scsi_prep_fn); 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);