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: 84nxMFtPq92w7W6Zw2yCf6uRbD3rqwXvxT5qnvvD3UWfdIIcV/+P9l4NStthZDJ3qgxrsw+0SC
 roFY2MxJYD9qyqP8z6qLTflAhhR0/M0y/fMcd7CzvCRe8jfw93ldzsX0luACXh2oAGqPWWrFiJ
 QyWyddR8j5FhiVizm6YOQhNZWMXdPMu6/z/YvsQo5+O8kXpEghecO+fsx39O6o+jf9ovwu5cC9
 kuy+tzuxZrJaYasb2heDS1A9zlGRkowIGwFGoS7dVC5NCLF1+JtvG/P5dAlfOrgEwZAgTPDUrM
 eH8=
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 7/7] udf: stop using ioctl_by_bdev
Thread-Topic: [PATCH 7/7] udf: stop using ioctl_by_bdev
Thread-Index: AQHWGT8E+au4mBM55E6ziMxUj9P3kw==
Date:   Thu, 23 Apr 2020 07:43:03 +0000
Message-ID: <BY5PR04MB6900BB48751678C5F736F7D2E7D30@BY5PR04MB6900.namprd04.prod.outlook.com>
References: <20200423071224.500849-1-hch@lst.de>
 <20200423071224.500849-8-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: 4e94bc12-013a-40c6-501b-08d7e759f499
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Apr 2020 07:43:03.6106
 (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: tHbLjStLbji7QDFVj18uSE4YwlwruyDW0mKIV+Pc8Cy52DnbMoe3E/etOMQzrcbP8g3LZ8JxMmCJKWNCIhS/JQ==
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:15, Christoph Hellwig wrote:=0A=
> Instead just call the CD-ROM layer functionality directly.=0A=
> =0A=
> Signed-off-by: Christoph Hellwig <hch@lst.de>=0A=
> ---=0A=
>  fs/udf/lowlevel.c | 29 +++++++++++++----------------=0A=
>  1 file changed, 13 insertions(+), 16 deletions(-)=0A=
> =0A=
> diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c=0A=
> index 5c7ec121990d..f1094cdcd6cd 100644=0A=
> --- a/fs/udf/lowlevel.c=0A=
> +++ b/fs/udf/lowlevel.c=0A=
> @@ -27,41 +27,38 @@=0A=
>  =0A=
>  unsigned int udf_get_last_session(struct super_block *sb)=0A=
>  {=0A=
> +	struct cdrom_device_info *cdi =3D disk_to_cdi(sb->s_bdev->bd_disk);=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=
>  =0A=
> -	vol_desc_start =3D 0;=0A=
> -	ms_info.addr_format =3D CDROM_LBA;=0A=
> -	i =3D ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long)&ms_info);=
=0A=
> +	if (!cdi) {=0A=
> +		udf_debug("CDROMMULTISESSION not supported.\n");=0A=
> +		return 0;=0A=
> +	}=0A=
>  =0A=
> -	if (i =3D=3D 0) {=0A=
> +	ms_info.addr_format =3D CDROM_LBA;=0A=
> +	if (cdrom_multisession(cdi, &ms_info) =3D=3D 0) {=0A=
>  		udf_debug("XA disk: %s, vol_desc_start=3D%d\n",=0A=
>  			  ms_info.xa_flag ? "yes" : "no", ms_info.addr.lba);=0A=
>  		if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */=0A=
> -			vol_desc_start =3D ms_info.addr.lba;=0A=
> -	} else {=0A=
> -		udf_debug("CDROMMULTISESSION not supported: rc=3D%d\n", i);=0A=
> +			return ms_info.addr.lba;=0A=
>  	}=0A=
> -	return vol_desc_start;=0A=
> +	return 0;=0A=
>  }=0A=
>  =0A=
>  unsigned long udf_get_last_block(struct super_block *sb)=0A=
>  {=0A=
>  	struct block_device *bdev =3D sb->s_bdev;=0A=
> +	struct cdrom_device_info *cdi =3D disk_to_cdi(bdev->bd_disk);=0A=
>  	unsigned long lblock =3D 0;=0A=
>  =0A=
>  	/*=0A=
> -	 * ioctl failed or returned obviously bogus value?=0A=
> +	 * The cdrom layer call failed or returned obviously bogus value?=0A=
>  	 * Try using the device size...=0A=
>  	 */=0A=
> -	if (ioctl_by_bdev(bdev, CDROM_LAST_WRITTEN, (unsigned long) &lblock) ||=
=0A=
> -	    lblock =3D=3D 0)=0A=
> +	if (!cdi || cdrom_get_last_written(cdi, &lblock) || lblock =3D=3D 0)=0A=
>  		lblock =3D i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits;=0A=
>  =0A=
>  	if (lblock)=0A=
>  		return lblock - 1;=0A=
> -	else=0A=
> -		return 0;=0A=
> +	return 0;=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=