From: Jan Kara <jack@suse.cz>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Tim Waugh <tim@cyberelk.net>,
Borislav Petkov <bp@alien8.de>, Jan Kara <jack@suse.com>,
linux-block@vger.kernel.org, linux-ide@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 7/7] udf: stop using ioctl_by_bdev
Date: Thu, 23 Apr 2020 13:05:51 +0200 [thread overview]
Message-ID: <20200423110551.GF3737@quack2.suse.cz> (raw)
In-Reply-To: <20200423071224.500849-8-hch@lst.de>
On Thu 23-04-20 09:12:24, Christoph Hellwig wrote:
> Instead just call the CD-ROM layer functionality directly.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
The patch looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/udf/lowlevel.c | 29 +++++++++++++----------------
> 1 file changed, 13 insertions(+), 16 deletions(-)
>
> diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c
> index 5c7ec121990d..f1094cdcd6cd 100644
> --- a/fs/udf/lowlevel.c
> +++ b/fs/udf/lowlevel.c
> @@ -27,41 +27,38 @@
>
> unsigned int udf_get_last_session(struct super_block *sb)
> {
> + struct cdrom_device_info *cdi = disk_to_cdi(sb->s_bdev->bd_disk);
> struct cdrom_multisession ms_info;
> - unsigned int vol_desc_start;
> - struct block_device *bdev = sb->s_bdev;
> - int i;
>
> - vol_desc_start = 0;
> - ms_info.addr_format = CDROM_LBA;
> - i = ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long)&ms_info);
> + if (!cdi) {
> + udf_debug("CDROMMULTISESSION not supported.\n");
> + return 0;
> + }
>
> - if (i == 0) {
> + ms_info.addr_format = CDROM_LBA;
> + if (cdrom_multisession(cdi, &ms_info) == 0) {
> udf_debug("XA disk: %s, vol_desc_start=%d\n",
> ms_info.xa_flag ? "yes" : "no", ms_info.addr.lba);
> if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
> - vol_desc_start = ms_info.addr.lba;
> - } else {
> - udf_debug("CDROMMULTISESSION not supported: rc=%d\n", i);
> + return ms_info.addr.lba;
> }
> - return vol_desc_start;
> + return 0;
> }
>
> unsigned long udf_get_last_block(struct super_block *sb)
> {
> struct block_device *bdev = sb->s_bdev;
> + struct cdrom_device_info *cdi = disk_to_cdi(bdev->bd_disk);
> unsigned long lblock = 0;
>
> /*
> - * ioctl failed or returned obviously bogus value?
> + * The cdrom layer call failed or returned obviously bogus value?
> * Try using the device size...
> */
> - if (ioctl_by_bdev(bdev, CDROM_LAST_WRITTEN, (unsigned long) &lblock) ||
> - lblock == 0)
> + if (!cdi || cdrom_get_last_written(cdi, &lblock) || lblock == 0)
> lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits;
>
> if (lblock)
> return lblock - 1;
> - else
> - return 0;
> + return 0;
> }
> --
> 2.26.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2020-04-23 11:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 7:12 stop using ioctl_by_bdev for file system access to CDROMs Christoph Hellwig
2020-04-23 7:12 ` [PATCH 1/7] block: add a cdrom_device_info pointer to struct gendisk Christoph Hellwig
2020-04-23 7:40 ` Damien Le Moal
2020-04-23 7:12 ` [PATCH 2/7] ide-cd: rename cdrom_read_tocentry Christoph Hellwig
2020-04-23 7:41 ` Damien Le Moal
2020-04-23 7:12 ` [PATCH 3/7] cdrom: factor out a cdrom_read_tocentry helper Christoph Hellwig
2020-04-23 7:41 ` Damien Le Moal
2020-04-23 7:12 ` [PATCH 4/7] cdrom: factor out a cdrom_multisession helper Christoph Hellwig
2020-04-23 7:41 ` Damien Le Moal
2020-04-23 7:12 ` [PATCH 5/7] hfsplus: stop using ioctl_by_bdev Christoph Hellwig
2020-04-23 7:42 ` Damien Le Moal
2020-04-23 7:12 ` [PATCH 6/7] isofs: " Christoph Hellwig
2020-04-23 7:42 ` Damien Le Moal
2020-04-23 11:03 ` Jan Kara
2020-04-24 6:52 ` Christoph Hellwig
2020-04-24 9:21 ` Jan Kara
2020-04-23 7:12 ` [PATCH 7/7] udf: " Christoph Hellwig
2020-04-23 7:43 ` Damien Le Moal
2020-04-23 11:05 ` Jan Kara [this message]
2020-04-25 7:56 stop using ioctl_by_bdev for file system access to CDROMs v2 Christoph Hellwig
2020-04-25 7:57 ` [PATCH 7/7] udf: stop using ioctl_by_bdev Christoph Hellwig
2020-04-27 6:18 ` Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200423110551.GF3737@quack2.suse.cz \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=bp@alien8.de \
--cc=hch@lst.de \
--cc=jack@suse.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=tim@cyberelk.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).