diff --git a/fs/udf/super.c b/fs/udf/super.c
index da8ce9f14387aab98fbdc8f6c3048b66d48bdc61..f8830803d389276ef1600eb43ab99d6824bb795d 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1023,7 +1023,6 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index)
 	if (bitmap == NULL)
 		return NULL;
 
-	bitmap->s_block_bitmap = (struct buffer_head **)(bitmap + 1);
 	bitmap->s_nr_groups = nr_groups;
 	return bitmap;
 }
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
index 8d1c9d4f439ee83395e7114e19248750f688fbf5..4f7ddb796991dcfc4658af5c2b65eb71beb838d8 100644
--- a/fs/udf/udf_sb.h
+++ b/fs/udf/udf_sb.h
@@ -83,7 +83,7 @@ struct udf_bitmap {
 	__u32			s_extLength;
 	__u32			s_extPosition;
 	int			s_nr_groups;
-	struct buffer_head 	**s_block_bitmap;
+	struct buffer_head 	*s_block_bitmap[0];
 };
 
 struct udf_part_map {