udf: Fix bug in VAT mapping code

Fix mapping of blocks using VAT when it is stored in an inode.
UDF_I(inode)->i_data already points to the beginning of VAT header so there's
no need to add udf_ext0_offset(inode).

Signed-off-by: Sebastian Manciulea <manciuleas@yahoo.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/udf/partition.c b/fs/udf/partition.c
index 2dfe4be2eeb2f99dc7cd588c37d3df8d37297699..63610f026ae15046d701d3ab45ab93a04ff51371 100644 (file)
--- a/fs/udf/partition.c
+++ b/fs/udf/partition.c
@@ -66,7 +66,8 @@ uint32_t udf_get_pblock_virt15(struct super_block *sb, uint32_t block,
        }
 
        if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
-               loc = le32_to_cpu(((__le32 *)iinfo->i_ext.i_data)[block]);
+               loc = le32_to_cpu(((__le32 *)(iinfo->i_ext.i_data +
+                       vdata->s_start_offset))[block]);
                goto translate;
        }
        index = (sb->s_blocksize - vdata->s_start_offset) / sizeof(uint32_t);

diff --git a/fs/udf/super.c b/fs/udf/super.c
index 29b19678327a8b612474dc84757e39bddd76bbf9..8f02b30c22efbc6f7c83ed9193c622bde3e35a3c 100644 (file)
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1215,8 +1215,7 @@ static int udf_load_vat(struct super_block *sb, int p_index, int type1_index)
                return 1;
 
        if (map->s_partition_type == UDF_VIRTUAL_MAP15) {
-               map->s_type_specific.s_virtual.s_start_offset =
-                       udf_ext0_offset(sbi->s_vat_inode);
+               map->s_type_specific.s_virtual.s_start_offset = 0;
                map->s_type_specific.s_virtual.s_num_entries =
                        (sbi->s_vat_inode->i_size - 36) >> 2;
        } else if (map->s_partition_type == UDF_VIRTUAL_MAP20) {
@@ -1233,8 +1232,7 @@ static int udf_load_vat(struct super_block *sb, int p_index, int type1_index)
                }
 
                map->s_type_specific.s_virtual.s_start_offset =
-                       le16_to_cpu(vat20->lengthHeader) +
-                       udf_ext0_offset(sbi->s_vat_inode);
+                       le16_to_cpu(vat20->lengthHeader);
                map->s_type_specific.s_virtual.s_num_entries =
                        (sbi->s_vat_inode->i_size -
                                map->s_type_specific.s_virtual.