Commit a6419fd8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

mtip32xx: remove the call to fsync_bdev on removal

del_gendisk already calls fsync_bdev for every partition, no need
to do this twice.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 040f04bd
...@@ -3687,7 +3687,6 @@ static int mtip_block_initialize(struct driver_data *dd) ...@@ -3687,7 +3687,6 @@ static int mtip_block_initialize(struct driver_data *dd)
/* Enable the block device and add it to /dev */ /* Enable the block device and add it to /dev */
device_add_disk(&dd->pdev->dev, dd->disk, NULL); device_add_disk(&dd->pdev->dev, dd->disk, NULL);
dd->bdev = bdget_disk(dd->disk, 0);
/* /*
* Now that the disk is active, initialize any sysfs attributes * Now that the disk is active, initialize any sysfs attributes
* managed by the protocol layer. * managed by the protocol layer.
...@@ -3721,9 +3720,6 @@ static int mtip_block_initialize(struct driver_data *dd) ...@@ -3721,9 +3720,6 @@ static int mtip_block_initialize(struct driver_data *dd)
return rv; return rv;
kthread_run_error: kthread_run_error:
bdput(dd->bdev);
dd->bdev = NULL;
/* Delete our gendisk. This also removes the device from /dev */ /* Delete our gendisk. This also removes the device from /dev */
del_gendisk(dd->disk); del_gendisk(dd->disk);
...@@ -3804,14 +3800,6 @@ static int mtip_block_remove(struct driver_data *dd) ...@@ -3804,14 +3800,6 @@ static int mtip_block_remove(struct driver_data *dd)
blk_mq_tagset_busy_iter(&dd->tags, mtip_no_dev_cleanup, dd); blk_mq_tagset_busy_iter(&dd->tags, mtip_no_dev_cleanup, dd);
blk_mq_unquiesce_queue(dd->queue); blk_mq_unquiesce_queue(dd->queue);
/*
* Delete our gendisk structure. This also removes the device
* from /dev
*/
if (dd->bdev) {
bdput(dd->bdev);
dd->bdev = NULL;
}
if (dd->disk) { if (dd->disk) {
if (test_bit(MTIP_DDF_INIT_DONE_BIT, &dd->dd_flag)) if (test_bit(MTIP_DDF_INIT_DONE_BIT, &dd->dd_flag))
del_gendisk(dd->disk); del_gendisk(dd->disk);
...@@ -4206,9 +4194,6 @@ static void mtip_pci_remove(struct pci_dev *pdev) ...@@ -4206,9 +4194,6 @@ static void mtip_pci_remove(struct pci_dev *pdev)
} while (atomic_read(&dd->irq_workers_active) != 0 && } while (atomic_read(&dd->irq_workers_active) != 0 &&
time_before(jiffies, to)); time_before(jiffies, to));
if (!dd->sr)
fsync_bdev(dd->bdev);
if (atomic_read(&dd->irq_workers_active) != 0) { if (atomic_read(&dd->irq_workers_active) != 0) {
dev_warn(&dd->pdev->dev, dev_warn(&dd->pdev->dev,
"Completion workers still active!\n"); "Completion workers still active!\n");
......
...@@ -463,8 +463,6 @@ struct driver_data { ...@@ -463,8 +463,6 @@ struct driver_data {
int isr_binding; int isr_binding;
struct block_device *bdev;
struct list_head online_list; /* linkage for online list */ struct list_head online_list; /* linkage for online list */
struct list_head remove_list; /* linkage for removing list */ struct list_head remove_list; /* linkage for removing list */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment