UDF: fix anchor point detection
PATCH 1/1 UDF: fix anchor point detection
According to ECMA 167 rev. 3 (see 3/8.4.2.1), Anchor Volume Descriptor Pointer should be recorded at two or more anchor points located at sectors 256, N, N - 256, where N - is a largest logical sector number at volume space.
So we should always try to detect N on UDF volume before trying to find Anchor Volume Descriptor (i.e. calling to udf_find_anchor()).
That said, all this patch does is updates the s_last_block even if the udf_vrs() returns positive value.
Originally written and tested by Yuri Per, ported on latest mainline by me.
Signed-off-by Yuri Per <[email protected]>
Signed-off-by Pavel Emelyanov <[email protected]>
Cc Max Lyadvinsky <[email protected]>
Cc Vladimir Simonov <[email protected]>
Cc Andrew Neporada <[email protected]>
Cc Kirill Korotaev <[email protected]>
---
fs/udf/super.c +8 -7
@@ -1486,16 +1486,17 @@ static int udf_check_valid(struct super_block *sb, int novrs, int silent)/* Check that it is NSR02 compliant */ /* Process any "CD-ROM Volume Descriptor Set" (ECMA 167 2/8.3.1) */ else { +struct udf_sb_info *sbi =UDF_SB (sb); + block =udf_vrs (sb, silent); -if (block ==-1 ) { -struct udf_sb_info *sbi =UDF_SB (sb); +if (block ==-1 )udf_debug ("Failed to read byte 32768. Assuming open " "disc. Skipping validity check\n" ); -if (!sbi->s_last_block) - sbi->s_last_block =udf_get_last_block (sb); -return 0 ; - }else -return !block; + +if (block && !sbi->s_last_block) + sbi->s_last_block =udf_get_last_block (sb); + +return !block; } }