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: /vi5WztUK5wWR2ypaGxc9s9hLpq9abtf9CJjtsDAtkfQgGg+u6DjN8CCml4jcDPLilG3qIfuRj
 yYJKkXNCxDDS8v+Vo9AoxNe+XGyYBvKFzZicsRt94ZQgOhP1qP3sg6AktrNCIf9AIKtf9vAtFS
 46tJKUmThVUy7HaYqyA6pD7HiAcliAoY4x8606CwJ9P3gm3lELSzT1lvoEcAwSZ005OOTo3ylq
 sDK4nN31LcnT/D4HtI8b9iRI6lcIlcXcMkg0aiaIwQEa3V6bRwm8FsujwBXrBIAwti4S/4jvsZ
 cYE=
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 6/7] isofs: stop using ioctl_by_bdev
Thread-Topic: [PATCH 6/7] isofs: stop using ioctl_by_bdev
Thread-Index: AQHWGT8MdkHUuDhP1kqEjWykHKN6yQ==
Date:   Thu, 23 Apr 2020 07:42:52 +0000
Message-ID: <BY5PR04MB6900744BDD64A977DE9BFAFAE7D30@BY5PR04MB6900.namprd04.prod.outlook.com>
References: <20200423071224.500849-1-hch@lst.de>
 <20200423071224.500849-7-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: 5ac01087-1d8d-40ab-d606-08d7e759ee04
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Apr 2020 07:42:52.5991
 (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: c2u/iY2cr7M8pFQiEcyYagU04B+40zC8SR/waguI89zAkLQ+XTwCN1ne9UqY958KjqfEDUWCg6XR9SNqD8RNPQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR04MB6723
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:16, Christoph Hellwig wrote:=0A=
> Instead just call the CD-ROM layer functionality directly, and turn the=
=0A=
> hot mess in isofs_get_last_session into remotely readable code.=0A=
> =0A=
> Signed-off-by: Christoph Hellwig <hch@lst.de>=0A=
> ---=0A=
>  fs/isofs/inode.c | 54 +++++++++++++++++++++++-------------------------=
=0A=
>  1 file changed, 26 insertions(+), 28 deletions(-)=0A=
> =0A=
> diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c=0A=
> index 62c0462dc89f..fc48923a9b6c 100644=0A=
> --- a/fs/isofs/inode.c=0A=
> +++ b/fs/isofs/inode.c=0A=
> @@ -544,43 +544,41 @@ static int isofs_show_options(struct seq_file *m, s=
truct dentry *root)=0A=
>  =0A=
>  static unsigned int isofs_get_last_session(struct super_block *sb, s32 s=
ession)=0A=
>  {=0A=
> -	struct cdrom_multisession ms_info;=0A=
> -	unsigned int vol_desc_start;=0A=
> -	struct block_device *bdev =3D sb->s_bdev;=0A=
> -	int i;=0A=
> +	struct cdrom_device_info *cdi =3D disk_to_cdi(sb->s_bdev->bd_disk);=0A=
> +	unsigned int vol_desc_start =3D 0;=0A=
>  =0A=
> -	vol_desc_start=3D0;=0A=
> -	ms_info.addr_format=3DCDROM_LBA;=0A=
>  	if (session > 0) {=0A=
> -		struct cdrom_tocentry Te;=0A=
> -		Te.cdte_track=3Dsession;=0A=
> -		Te.cdte_format=3DCDROM_LBA;=0A=
> -		i =3D ioctl_by_bdev(bdev, CDROMREADTOCENTRY, (unsigned long) &Te);=0A=
> -		if (!i) {=0A=
> +		struct cdrom_tocentry te;=0A=
> +=0A=
> +		if (!cdi)=0A=
> +			return -EINVAL;=0A=
> +=0A=
> +		te.cdte_track =3D session;=0A=
> +		te.cdte_format =3D CDROM_LBA;=0A=
> +		if (cdrom_read_tocentry(cdi, &te) =3D=3D 0) {=0A=
>  			printk(KERN_DEBUG "ISOFS: Session %d start %d type %d\n",=0A=
> -				session, Te.cdte_addr.lba,=0A=
> -				Te.cdte_ctrl&CDROM_DATA_TRACK);=0A=
> -			if ((Te.cdte_ctrl&CDROM_DATA_TRACK) =3D=3D 4)=0A=
> -				return Te.cdte_addr.lba;=0A=
> +				session, te.cdte_addr.lba,=0A=
> +				te.cdte_ctrl & CDROM_DATA_TRACK);=0A=
> +			if ((te.cdte_ctrl & CDROM_DATA_TRACK) =3D=3D 4)=0A=
> +				return te.cdte_addr.lba;=0A=
>  		}=0A=
>  =0A=
>  		printk(KERN_ERR "ISOFS: Invalid session number or type of track\n");=
=0A=
>  	}=0A=
> -	i =3D ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long) &ms_info);=
=0A=
> -	if (session > 0)=0A=
> -		printk(KERN_ERR "ISOFS: Invalid session number\n");=0A=
> -#if 0=0A=
> -	printk(KERN_DEBUG "isofs.inode: CDROMMULTISESSION: rc=3D%d\n",i);=0A=
> -	if (i=3D=3D0) {=0A=
> -		printk(KERN_DEBUG "isofs.inode: XA disk: %s\n",ms_info.xa_flag?"yes":"=
no");=0A=
> -		printk(KERN_DEBUG "isofs.inode: vol_desc_start =3D %d\n", ms_info.addr=
.lba);=0A=
> -	}=0A=
> -#endif=0A=
> -	if (i=3D=3D0)=0A=
> +=0A=
> +	if (cdi) {=0A=
> +		struct cdrom_multisession ms_info;=0A=
> +=0A=
> +		ms_info.addr_format =3D CDROM_LBA;=0A=
> +		if (cdrom_multisession(cdi, &ms_info) =3D=3D 0) {=0A=
>  #if WE_OBEY_THE_WRITTEN_STANDARDS=0A=
> -		if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */=0A=
> +			/* necessary for a valid ms_info.addr */=0A=
> +			if (ms_info.xa_flag)=0A=
>  #endif=0A=
> -			vol_desc_start=3Dms_info.addr.lba;=0A=
> +				vol_desc_start =3D ms_info.addr.lba;=0A=
> +		}=0A=
> +	}=0A=
> +=0A=
>  	return vol_desc_start;=0A=
>  }=0A=
>  =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=