udf: Improve anchor block detection
Add <last block>+1 and <last block>-1 to a list of blocks which can be the real last recorded block on a UDF media. Sebastian Manciulea <manciuleas@yahoo.com> claims this helps some drive + media combinations he is able to test. Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
423cf6dc04
commit
5fb28aa25a
@ -709,14 +709,16 @@ static int udf_check_anchor_block(struct super_block *sb, sector_t block,
|
|||||||
static sector_t udf_scan_anchors(struct super_block *sb, bool varconv,
|
static sector_t udf_scan_anchors(struct super_block *sb, bool varconv,
|
||||||
sector_t lastblock)
|
sector_t lastblock)
|
||||||
{
|
{
|
||||||
sector_t last[4];
|
sector_t last[6];
|
||||||
int i;
|
int i;
|
||||||
struct udf_sb_info *sbi = UDF_SB(sb);
|
struct udf_sb_info *sbi = UDF_SB(sb);
|
||||||
|
|
||||||
last[0] = lastblock;
|
last[0] = lastblock;
|
||||||
last[1] = last[0] - 2;
|
last[1] = last[0] - 1;
|
||||||
last[2] = last[0] - 150;
|
last[2] = last[0] + 1;
|
||||||
last[3] = last[0] - 152;
|
last[3] = last[0] - 2;
|
||||||
|
last[4] = last[0] - 150;
|
||||||
|
last[5] = last[0] - 152;
|
||||||
|
|
||||||
/* according to spec, anchor is in either:
|
/* according to spec, anchor is in either:
|
||||||
* block 256
|
* block 256
|
||||||
@ -727,6 +729,9 @@ static sector_t udf_scan_anchors(struct super_block *sb, bool varconv,
|
|||||||
for (i = 0; i < ARRAY_SIZE(last); i++) {
|
for (i = 0; i < ARRAY_SIZE(last); i++) {
|
||||||
if (last[i] < 0)
|
if (last[i] < 0)
|
||||||
continue;
|
continue;
|
||||||
|
if (last[i] >= sb->s_bdev->bd_inode->i_size >>
|
||||||
|
sb->s_blocksize_bits)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (udf_check_anchor_block(sb, last[i], varconv)) {
|
if (udf_check_anchor_block(sb, last[i], varconv)) {
|
||||||
sbi->s_anchor[0] = last[i];
|
sbi->s_anchor[0] = last[i];
|
||||||
|
Loading…
Reference in New Issue
Block a user