aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2015-04-14 16:56:23 -0400
committerJames Bottomley <JBottomley@Odin.com>2015-04-16 13:36:14 -0400
commite727c42bd55794765c460b7ac2b6cc969f2a9698 (patch)
treedd02fc5cafdbeb30a90ee9a700df301f887b26f4
parent0351b8f81392c6dbbbb036e5c8f73ceff68726e9 (diff)
sd: Unregister integrity profile
The new integrity code did not correctly unregister the profile for SD disks. Call blk_integrity_unregister() when we release a disk. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Reported-by: Sagi Grimberg <sagig@dev.mellanox.co.il> Tested-by: Sagi Grimberg <sagig@mellanox.com> Cc: stable@vger.kernel.org # v3.17+ Signed-off-by: James Bottomley <JBottomley@Odin.com>
-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 dcc42446f58a..79beebf53302 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3076,6 +3076,7 @@ static void scsi_disk_release(struct device *dev)
3076 ida_remove(&sd_index_ida, sdkp->index); 3076 ida_remove(&sd_index_ida, sdkp->index);
3077 spin_unlock(&sd_index_lock); 3077 spin_unlock(&sd_index_lock);
3078 3078
3079 blk_integrity_unregister(disk);
3079 disk->private_data = NULL; 3080 disk->private_data = NULL;
3080 put_disk(disk); 3081 put_disk(disk);
3081 put_device(&sdkp->device->sdev_gendev); 3082 put_device(&sdkp->device->sdev_gendev);