Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: Td0tyOxJrenx/KJDpwny+iaFB0WYCw7IRYk3dbHSo+Frs9PUnuxd3TFUZKccEE2Xh6D3XsrAEa
 23DayTwRNA/oShPu847Tz0E+sUdMwhAd3g48zF+i7R5nlWC7JXVrTGP/GhlCKDnB+gph22Qx3w
 dGnCoPO1TilLFVmxOGFlRvICUY64Cg67f2c8Y7xlGsyhM7W0G9t/ZBXyfl8VIIHSordiPYf9EB
 xda4LQcriL93234UeXEKN2Fuufuvc+SWchecjmSipZuIAtZhnfj6hvRhLICWZlWFSlKDc5OfVr
 HCA=
From:   Damien Le Moal <Damien.LeMoal@wdc.com>
To:     Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>
CC:     Tim Waugh <tim@cyberelk.net>, Borislav Petkov <bp@alien8.de>,
        Jan Kara <jack@suse.com>,
        "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
        "linux-ide@vger.kernel.org" <linux-ide@vger.kernel.org>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/7] block: add a cdrom_device_info pointer to struct
 gendisk
Thread-Topic: [PATCH 1/7] block: add a cdrom_device_info pointer to struct
 gendisk
Thread-Index: AQHWGT77nWKFLvac9USA8vZMcoH19A==
Date:   Thu, 23 Apr 2020 07:40:40 +0000
Message-ID: <BY5PR04MB6900D254672137CF0FA07136E7D30@BY5PR04MB6900.namprd04.prod.outlook.com>
References: <20200423071224.500849-1-hch@lst.de>
 <20200423071224.500849-2-hch@lst.de>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 43fa2caf-1c44-4f0f-4a07-08d7e7599f1e
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Apr 2020 07:40:40.2279
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: uwMr+2nppbqE0hQ3YPRsm5bG03A5NO9VNGDQNaBMtxJpsPf38ZBUeK8GAa5QqVDqJyuQiGduyC54ykRqgudafg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR04MB7076
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2020/04/23 16:15, Christoph Hellwig wrote:=0A=
> Add a pointer to the CDROM information structure to struct gendisk.=0A=
> This will allow various removable media file systems to call directly=0A=
> into the CDROM layer instead of abusing ioctls with kernel pointers.=0A=
> =0A=
> Signed-off-by: Christoph Hellwig <hch@lst.de>=0A=
> ---=0A=
>  drivers/block/paride/pcd.c | 2 +-=0A=
>  drivers/cdrom/cdrom.c      | 5 ++++-=0A=
>  drivers/cdrom/gdrom.c      | 2 +-=0A=
>  drivers/ide/ide-cd.c       | 3 +--=0A=
>  drivers/scsi/sr.c          | 3 +--=0A=
>  include/linux/cdrom.h      | 2 +-=0A=
>  include/linux/genhd.h      | 9 +++++++++=0A=
>  7 files changed, 18 insertions(+), 8 deletions(-)=0A=
> =0A=
> diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c=0A=
> index cda5cf917e9a..5124eca90e83 100644=0A=
> --- a/drivers/block/paride/pcd.c=0A=
> +++ b/drivers/block/paride/pcd.c=0A=
> @@ -1032,7 +1032,7 @@ static int __init pcd_init(void)=0A=
>  =0A=
>  	for (unit =3D 0, cd =3D pcd; unit < PCD_UNITS; unit++, cd++) {=0A=
>  		if (cd->present) {=0A=
> -			register_cdrom(&cd->info);=0A=
> +			register_cdrom(cd->disk, &cd->info);=0A=
>  			cd->disk->private_data =3D cd;=0A=
>  			add_disk(cd->disk);=0A=
>  		}=0A=
> diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c=0A=
> index faca0f346fff..a1d2112fd283 100644=0A=
> --- a/drivers/cdrom/cdrom.c=0A=
> +++ b/drivers/cdrom/cdrom.c=0A=
> @@ -586,7 +586,7 @@ static int cdrom_mrw_set_lba_space(struct cdrom_devic=
e_info *cdi, int space)=0A=
>  	return 0;=0A=
>  }=0A=
>  =0A=
> -int register_cdrom(struct cdrom_device_info *cdi)=0A=
> +int register_cdrom(struct gendisk *disk, struct cdrom_device_info *cdi)=
=0A=
>  {=0A=
>  	static char banner_printed;=0A=
>  	const struct cdrom_device_ops *cdo =3D cdi->ops;=0A=
> @@ -601,6 +601,9 @@ int register_cdrom(struct cdrom_device_info *cdi)=0A=
>  		cdrom_sysctl_register();=0A=
>  	}=0A=
>  =0A=
> +	cdi->disk =3D disk;=0A=
> +	disk->cdi =3D cdi;=0A=
> +=0A=
>  	ENSURE(cdo, drive_status, CDC_DRIVE_STATUS);=0A=
>  	if (cdo->check_events =3D=3D NULL && cdo->media_changed =3D=3D NULL)=0A=
>  		WARN_ON_ONCE(cdo->capability & (CDC_MEDIA_CHANGED | CDC_SELECT_DISC));=
=0A=
> diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c=0A=
> index c51292c2a131..09b0cd292720 100644=0A=
> --- a/drivers/cdrom/gdrom.c=0A=
> +++ b/drivers/cdrom/gdrom.c=0A=
> @@ -770,7 +770,7 @@ static int probe_gdrom(struct platform_device *devptr=
)=0A=
>  		goto probe_fail_no_disk;=0A=
>  	}=0A=
>  	probe_gdrom_setupdisk();=0A=
> -	if (register_cdrom(gd.cd_info)) {=0A=
> +	if (register_cdrom(gd.disk, gd.cd_info)) {=0A=
>  		err =3D -ENODEV;=0A=
>  		goto probe_fail_cdrom_register;=0A=
>  	}=0A=
> diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c=0A=
> index dcf8b51b47fd..40e124eb918a 100644=0A=
> --- a/drivers/ide/ide-cd.c=0A=
> +++ b/drivers/ide/ide-cd.c=0A=
> @@ -1305,8 +1305,7 @@ static int ide_cdrom_register(ide_drive_t *drive, i=
nt nslots)=0A=
>  	if (drive->atapi_flags & IDE_AFLAG_NO_SPEED_SELECT)=0A=
>  		devinfo->mask |=3D CDC_SELECT_SPEED;=0A=
>  =0A=
> -	devinfo->disk =3D info->disk;=0A=
> -	return register_cdrom(devinfo);=0A=
> +	return register_cdrom(info->disk, devinfo);=0A=
>  }=0A=
>  =0A=
>  static int ide_cdrom_probe_capabilities(ide_drive_t *drive)=0A=
> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c=0A=
> index d2fe3fa470f9..f9b589d60a46 100644=0A=
> --- a/drivers/scsi/sr.c=0A=
> +++ b/drivers/scsi/sr.c=0A=
> @@ -794,9 +794,8 @@ static int sr_probe(struct device *dev)=0A=
>  	set_capacity(disk, cd->capacity);=0A=
>  	disk->private_data =3D &cd->driver;=0A=
>  	disk->queue =3D sdev->request_queue;=0A=
> -	cd->cdi.disk =3D disk;=0A=
>  =0A=
> -	if (register_cdrom(&cd->cdi))=0A=
> +	if (register_cdrom(disk, &cd->cdi))=0A=
>  		goto fail_put;=0A=
>  =0A=
>  	/*=0A=
> diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h=0A=
> index 528271c60018..4f74ce050253 100644=0A=
> --- a/include/linux/cdrom.h=0A=
> +++ b/include/linux/cdrom.h=0A=
> @@ -104,7 +104,7 @@ extern unsigned int cdrom_check_events(struct cdrom_d=
evice_info *cdi,=0A=
>  				       unsigned int clearing);=0A=
>  extern int cdrom_media_changed(struct cdrom_device_info *);=0A=
>  =0A=
> -extern int register_cdrom(struct cdrom_device_info *cdi);=0A=
> +extern int register_cdrom(struct gendisk *disk, struct cdrom_device_info=
 *cdi);=0A=
>  extern void unregister_cdrom(struct cdrom_device_info *cdi);=0A=
>  =0A=
>  typedef struct {=0A=
> diff --git a/include/linux/genhd.h b/include/linux/genhd.h=0A=
> index 058d895544c7..f9c226f9546a 100644=0A=
> --- a/include/linux/genhd.h=0A=
> +++ b/include/linux/genhd.h=0A=
> @@ -217,11 +217,20 @@ struct gendisk {=0A=
>  #ifdef  CONFIG_BLK_DEV_INTEGRITY=0A=
>  	struct kobject integrity_kobj;=0A=
>  #endif	/* CONFIG_BLK_DEV_INTEGRITY */=0A=
> +#if IS_ENABLED(CONFIG_CDROM)=0A=
> +	struct cdrom_device_info *cdi;=0A=
> +#endif=0A=
>  	int node_id;=0A=
>  	struct badblocks *bb;=0A=
>  	struct lockdep_map lockdep_map;=0A=
>  };=0A=
>  =0A=
> +#if IS_REACHABLE(CONFIG_CDROM)=0A=
> +#define disk_to_cdi(disk)	((disk)->cdi)=0A=
> +#else=0A=
> +#define disk_to_cdi(disk)	NULL=0A=
> +#endif=0A=
> +=0A=
>  static inline struct gendisk *part_to_disk(struct hd_struct *part)=0A=
>  {=0A=
>  	if (likely(part)) {=0A=
> =0A=
=0A=
Looks OK to me.=0A=
=0A=
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>=0A=
=0A=
-- =0A=
Damien Le Moal=0A=
Western Digital Research=0A=