Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfsplus: 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: 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:04 +02:00 committed by Jens Axboe
parent eaf8e3e4b5
commit f252fa33dc
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fs/hfsplus/wrapper.c
View File

@ -127,31 +127,34 @@ static int hfsplus_read_mdb(void *bufptr, struct hfsplus_wd *wd)
static int hfsplus_get_last_session(struct super_block *sb, static int hfsplus_get_last_session(struct super_block *sb,
sector_t *start, sector_t *size) sector_t *start, sector_t *size)
{ {
struct cdrom_multisession ms_info; struct cdrom_device_info *cdi = disk_to_cdi(sb->s_bdev->bd_disk);
struct cdrom_tocentry te;
int res;
/* default values */ /* default values */
*start = 0; *start = 0;
*size = i_size_read(sb->s_bdev->bd_inode) >> 9; *size = i_size_read(sb->s_bdev->bd_inode) >> 9;
if (HFSPLUS_SB(sb)->session >= 0) { if (HFSPLUS_SB(sb)->session >= 0) {
struct cdrom_tocentry te;
if (!cdi)
return -EINVAL;
te.cdte_track = HFSPLUS_SB(sb)->session; te.cdte_track = HFSPLUS_SB(sb)->session;
te.cdte_format = CDROM_LBA; te.cdte_format = CDROM_LBA;
res = ioctl_by_bdev(sb->s_bdev, if (cdrom_read_tocentry(cdi, &te) ||
CDROMREADTOCENTRY, (unsigned long)&te); (te.cdte_ctrl & CDROM_DATA_TRACK) != 4) {
if (!res && (te.cdte_ctrl & CDROM_DATA_TRACK) == 4) { pr_err("invalid session number or type of track\n");
*start = (sector_t)te.cdte_addr.lba << 2; return -EINVAL;
return 0;
} }
pr_err("invalid session number or type of track\n"); *start = (sector_t)te.cdte_addr.lba << 2;
return -EINVAL; } else if (cdi) {
struct cdrom_multisession ms_info;
ms_info.addr_format = CDROM_LBA;
if (cdrom_multisession(cdi, &ms_info) == 0 && ms_info.xa_flag)
*start = (sector_t)ms_info.addr.lba << 2;
} }
ms_info.addr_format = CDROM_LBA;
res = ioctl_by_bdev(sb->s_bdev, CDROMMULTISESSION,
(unsigned long)&ms_info);
if (!res && ms_info.xa_flag)
*start = (sector_t)ms_info.addr.lba << 2;
return 0; return 0;
} }