summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-07-03 08:07:04 -0600
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:24:15 +0200
commit82b6d57fb11644fe25c8a1346627ad0027673dae (patch)
tree0270b7eb3e995f88cbe1e8626153af15a5cc05d8 /drivers/scsi/sd.c
parent00fff26539bfe3fad21c164fc4002d9ede056fb0 (diff)
downloadop-kernel-dev-82b6d57fb11644fe25c8a1346627ad0027673dae.zip
op-kernel-dev-82b6d57fb11644fe25c8a1346627ad0027673dae.tar.gz
scsi: need to reset unprep_rq_fn in sd_remove
This is for block's for-2.6.36. We need to reset q->unprep_rq_fn in sd_remove. Otherwise we hit kernel oops if we access to a scsi disk device via sg after removing scsi disk module. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d9a4314..0994ab6 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2384,6 +2384,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);
+ blk_queue_unprep_rq(sdkp->device->request_queue, NULL);
device_del(&sdkp->dev);
del_gendisk(sdkp->disk);
sd_shutdown(dev);
OpenPOWER on IntegriCloud