diff options
| author | Jan Kara <jack@suse.cz> | 2023-01-18 13:55:31 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2023-01-26 16:46:32 +0100 |
| commit | bd904f3c74969442b0ac42f81c0d02da54cd47eb (patch) | |
| tree | 193683857ddd60dcf5eec2e68875a9327161e3ba /fs/udf/lowlevel.c | |
| parent | 1ea1cd11c72d1405a6b98440a9d5ea82dfa07166 (diff) | |
udf: Unify types in anchor block detection
When detecting last recorded block and from it derived anchor block
position, we were mixing unsigned long, u32, and sector_t types. Since
udf supports only 32-bit block numbers this is harmless but sometimes
makes things awkward. Convert everything to udf_pblk_t and also handle
the situation when block device size would not fit into udf_pblk_t.
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/lowlevel.c')
| -rw-r--r-- | fs/udf/lowlevel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c index 46d697172197..c87ed942d076 100644 --- a/fs/udf/lowlevel.c +++ b/fs/udf/lowlevel.c @@ -45,7 +45,7 @@ unsigned int udf_get_last_session(struct super_block *sb) return 0; } -unsigned long udf_get_last_block(struct super_block *sb) +udf_pblk_t udf_get_last_block(struct super_block *sb) { struct cdrom_device_info *cdi = disk_to_cdi(sb->s_bdev->bd_disk); unsigned long lblock = 0; @@ -54,8 +54,11 @@ unsigned long udf_get_last_block(struct super_block *sb) * The cdrom layer call failed or returned obviously bogus value? * Try using the device size... */ - if (!cdi || cdrom_get_last_written(cdi, &lblock) || lblock == 0) + if (!cdi || cdrom_get_last_written(cdi, &lblock) || lblock == 0) { + if (sb_bdev_nr_blocks(sb) > ~(udf_pblk_t)0) + return 0; lblock = sb_bdev_nr_blocks(sb); + } if (lblock) return lblock - 1; |