3 files changed, 6 insertions, 0 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 49a8c589e346..f1489999cf91 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1933,6 +1933,7 @@ static void ide_cd_remove(ide_drive_t *drive)
 
         ide_proc_unregister_driver(drive, info->driver);
 
+        blk_unregister_filter(info->disk);
         del_gendisk(info->disk);
 
         ide_cd_put(info);
@@ -2158,6 +2159,7 @@ static int ide_cd_probe(ide_drive_t *drive)
         g->fops = &idecd_ops;
         g->flags |= GENHD_FL_REMOVABLE;
         add_disk(g);
+        blk_register_filter(g);
         return 0;
 
 out_free_cd:
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e5e7d7856454..2a2bc89aba83 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1875,6 +1875,7 @@ static int sd_probe(struct device *dev)
 
         dev_set_drvdata(dev, sdkp);
         add_disk(gd);
+        blk_register_filter(gd);
         sd_dif_config_host(sdkp);
 
         sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
@@ -1908,6 +1909,7 @@ static int sd_remove(struct device *dev)
         struct scsi_disk *sdkp = dev_get_drvdata(dev);
 
         device_del(&sdkp->dev);
+        blk_unregister_filter(sdkp->disk);
         del_gendisk(sdkp->disk);
         sd_shutdown(dev);
 
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 27f5bfd1def3..3292965bfd84 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -656,6 +656,7 @@ static int sr_probe(struct device *dev)
         dev_set_drvdata(dev, cd);
         disk->flags |= GENHD_FL_REMOVABLE;
         add_disk(disk);
+        blk_register_filter(disk);
 
         sdev_printk(KERN_DEBUG, sdev,
                     "Attached scsi CD-ROM %s\n", cd->cdi.name);
@@ -894,6 +895,7 @@ static int sr_remove(struct device *dev)
 {
         struct scsi_cd *cd = dev_get_drvdata(dev);
 
+        blk_unregister_filter(cd->disk);
         del_gendisk(cd->disk);
 
         mutex_lock(&sr_ref_mutex);