diff options
| author | Mark Brown <broonie@kernel.org> | 2024-10-07 16:01:00 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-07 16:01:00 +0300 |
| commit | 85eadae61931f6268b49b5722039e5a248b9ee4c (patch) | |
| tree | 3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /fs/udf/partition.c | |
| parent | dc16594d9967773ca891b3d9111f152e3c99d1cf (diff) | |
| parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) | |
| download | linux-85eadae61931f6268b49b5722039e5a248b9ee4c.tar.xz | |
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'fs/udf/partition.c')
| -rw-r--r-- | fs/udf/partition.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/udf/partition.c b/fs/udf/partition.c index af877991edc1..2b85c9501bed 100644 --- a/fs/udf/partition.c +++ b/fs/udf/partition.c @@ -282,9 +282,11 @@ static uint32_t udf_try_read_meta(struct inode *inode, uint32_t block, sector_t ext_offset; struct extent_position epos = {}; uint32_t phyblock; + int8_t etype; + int err = 0; - if (inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset) != - (EXT_RECORDED_ALLOCATED >> 30)) + err = inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset, &etype); + if (err <= 0 || etype != (EXT_RECORDED_ALLOCATED >> 30)) phyblock = 0xFFFFFFFF; else { map = &UDF_SB(sb)->s_partmaps[partition]; |