diff options
| author | Mark Brown <broonie@kernel.org> | 2024-10-07 14:54:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-07 14:54:21 +0100 |
| commit | 344190e0347324d95393c561a4b8c8dfa8cd628b (patch) | |
| tree | 20d054b028d30ed361fbaeb20f319482e4a8312f /fs/udf/partition.c | |
| parent | e4926ca0189dac2e780d6d3cca92052376fd7f0e (diff) | |
| parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) | |
ASoC: Merge up v6.12
Fixes build issues with 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]; |