iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udf: stop using ioctl_by_bdev

Browse Source 
Instead just call the CDROM layer functionality directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-04-25 09:57:06 +02:00 committed by Jens Axboe
parent 11aa40a0eb
commit 8b075e5ba4
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/udf/lowlevel.c
View File

@ -27,41 +27,38 @@
unsigned int udf_get_last_session(struct super_block *sb) 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; struct cdrom_multisession ms_info;
unsigned int vol_desc_start;
struct block_device *bdev = sb->s_bdev;
int i;
vol_desc_start = 0; if (!cdi) {
udf_debug("CDROMMULTISESSION not supported.\n");
return 0;
}
ms_info.addr_format = CDROM_LBA; ms_info.addr_format = CDROM_LBA;
i = ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long)&ms_info); if (cdrom_multisession(cdi, &ms_info) == 0) {
if (i == 0) {
udf_debug("XA disk: %s, vol_desc_start=%d\n", udf_debug("XA disk: %s, vol_desc_start=%d\n",
ms_info.xa_flag ? "yes" : "no", ms_info.addr.lba); ms_info.xa_flag ? "yes" : "no", ms_info.addr.lba);
if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */ if (ms_info.xa_flag) /* necessary for a valid ms_info.addr */
vol_desc_start = ms_info.addr.lba; return ms_info.addr.lba;
} else {
udf_debug("CDROMMULTISESSION not supported: rc=%d\n", i);
} }
return vol_desc_start; return 0;
} }
unsigned long udf_get_last_block(struct super_block *sb) unsigned long udf_get_last_block(struct super_block *sb)
{ {
struct block_device *bdev = sb->s_bdev; struct block_device *bdev = sb->s_bdev;
struct cdrom_device_info *cdi = disk_to_cdi(bdev->bd_disk);
unsigned long lblock = 0; 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... * Try using the device size...
*/ */
if (ioctl_by_bdev(bdev, CDROM_LAST_WRITTEN, (unsigned long) &lblock) || if (!cdi || cdrom_get_last_written(cdi, &lblock) || lblock == 0)
lblock == 0)
lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits; lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits;
if (lblock) if (lblock)
return lblock - 1; return lblock - 1;
else return 0;
return 0;
} }