diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-04-25 09:57:00 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-05-04 10:13:42 -0600 |
| commit | a711d91cd97e6c9a554ccd1652527a7f36661857 (patch) | |
| tree | f2cde770a237e0bc8415b86a709cfa070a0d7a21 /drivers/scsi/sr.c | |
| parent | 21f3cfeab304fc07b90d93d98d4d2f62110fe6b2 (diff) | |
| download | linux-a711d91cd97e6c9a554ccd1652527a7f36661857.tar.bz2 | |
block: add a cdrom_device_info pointer to struct gendisk
Add a pointer to the CDROM information structure to struct gendisk.
This will allow various removable media file systems to call directly
into the CDROM layer instead of abusing ioctls with kernel pointers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index d2fe3fa470f9..f9b589d60a46 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -794,9 +794,8 @@ static int sr_probe(struct device *dev) set_capacity(disk, cd->capacity); disk->private_data = &cd->driver; disk->queue = sdev->request_queue; - cd->cdi.disk = disk; - if (register_cdrom(&cd->cdi)) + if (register_cdrom(disk, &cd->cdi)) goto fail_put; /* |