From 5a531cd3a68f7f74b8c50f8e722d39b77d6a43c1 Mon Sep 17 00:00:00 2001
From: Sebastian Manciulea <manciuleas@yahoo.com>
Date: Mon, 14 Apr 2008 17:06:36 +0200
Subject: [PATCH] --- yaml --- r: 91843 b: refs/heads/master c:
 47c9358a015199ed37c66235a2238271a7c8041f h: refs/heads/master i:   91841:
 4c1b86bc25870b5617ee2d6f48fed457802c965e   91839:
 02fc839851716f7a2b87f1a8d16c64bac4d0d788 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/udf/partition.c | 3 ++-
 trunk/fs/udf/super.c     | 6 ++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 88aea10da7ba..2ba4b697f8e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfb257a5981af805a9394f00f75d3d9f7b611cc0
+refs/heads/master: 47c9358a015199ed37c66235a2238271a7c8041f
diff --git a/trunk/fs/udf/partition.c b/trunk/fs/udf/partition.c
index 2dfe4be2eeb2..63610f026ae1 100644
--- a/trunk/fs/udf/partition.c
+++ b/trunk/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/trunk/fs/udf/super.c b/trunk/fs/udf/super.c
index 29b19678327a..8f02b30c22ef 100644
--- a/trunk/fs/udf/super.c
+++ b/trunk/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.