#
# see http://bugzilla.kernel.org/show_bug.cgi?id=9872
#

diff -Naur linux-2.6.29/drivers/scsi/scsi_lib.c linux-2.6.29-alx/drivers/scsi/scsi_lib.c
--- linux-2.6.29/drivers/scsi/scsi_lib.c	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29-alx/drivers/scsi/scsi_lib.c	2009-08-05 16:03:06.000000000 +0200
@@ -1411,6 +1411,7 @@
 		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
diff -Naur linux-2.6.29/drivers/scsi/scsi_priv.h linux-2.6.29-alx/drivers/scsi/scsi_priv.h
--- linux-2.6.29/drivers/scsi/scsi_priv.h	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29-alx/drivers/scsi/scsi_priv.h	2009-08-05 16:03:58.000000000 +0200
@@ -74,7 +74,6 @@
 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 */
diff -Naur linux-2.6.29/drivers/scsi/scsi_sysfs.c linux-2.6.29-alx/drivers/scsi/scsi_sysfs.c
--- linux-2.6.29/drivers/scsi/scsi_sysfs.c	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29-alx/drivers/scsi/scsi_sysfs.c	2009-08-05 16:04:41.000000000 +0200
@@ -420,29 +420,12 @@
 	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);
 
diff -Naur linux-2.6.29/drivers/scsi/sd.c linux-2.6.29-alx/drivers/scsi/sd.c
--- linux-2.6.29/drivers/scsi/sd.c	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29-alx/drivers/scsi/sd.c	2009-08-05 16:05:26.000000000 +0200
@@ -1961,6 +1961,8 @@
 {
 	struct scsi_disk *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);
diff -Naur linux-2.6.29/drivers/scsi/sr.c linux-2.6.29-alx/drivers/scsi/sr.c
--- linux-2.6.29/drivers/scsi/sr.c	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29-alx/drivers/scsi/sr.c	2009-08-05 16:06:09.000000000 +0200
@@ -889,6 +889,7 @@
 {
 	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);
diff -Naur linux-2.6.29/include/scsi/scsi_driver.h linux-2.6.29-alx/include/scsi/scsi_driver.h
--- linux-2.6.29/include/scsi/scsi_driver.h	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29-alx/include/scsi/scsi_driver.h	2009-08-05 16:06:52.000000000 +0200
@@ -32,5 +32,6 @@
 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 */