| Message ID | 20210823202930.137278-4-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Mike Snitzer |
| Headers | show |
| Series | block: first batch of add_disk() error handling conversions | expand |
On Mon, Aug 23, 2021 at 01:29:23PM -0700, Luis Chamberlain wrote: > The single put_disk() is useful if you know you're not doing > a cleanup after add_disk(), but since we want to add support > for that, just use the normal form of blk_cleanup_disk() to > cleanup the queue and put the disk. > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> .. not needed as the cleanup is done by the core scsi code. -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
On Tue, Aug 24, 2021 at 07:00:27AM +0100, Christoph Hellwig wrote: > On Mon, Aug 23, 2021 at 01:29:23PM -0700, Luis Chamberlain wrote: > > The single put_disk() is useful if you know you're not doing > > a cleanup after add_disk(), but since we want to add support > > for that, just use the normal form of blk_cleanup_disk() to > > cleanup the queue and put the disk. > > > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> > > .. not needed as the cleanup is done by the core scsi code. Dropped. Luis -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index a0df27db4d61..dc78ad96e6f9 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -792,7 +792,7 @@ static int sr_probe(struct device *dev) clear_bit(minor, sr_index_bits); spin_unlock(&sr_index_lock); fail_put: - put_disk(disk); + blk_cleanup_disk(disk); mutex_destroy(&cd->lock); fail_free: kfree(cd);
The single put_disk() is useful if you know you're not doing a cleanup after add_disk(), but since we want to add support for that, just use the normal form of blk_cleanup_disk() to cleanup the queue and put the disk. Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/scsi/sr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)