patch-2.4.6 linux/fs/udf/balloc.c

• Lines: 786
• Date: Mon Jun 11 19:15:27 2001
• Orig file: v2.4.5/linux/fs/udf/balloc.c
• Orig date: Tue Sep 5 14:07:30 2000

diff -u --recursive --new-file v2.4.5/linux/fs/udf/balloc.c linux/fs/udf/balloc.c
@@ -7,7 +7,7 @@
  * CONTACTS
  *	E-mail regarding any portion of the Linux UDF file system should be
  *	directed to the development team mailing list (run by majordomo):
- *		linux_udf@hootie.lvld.hp.com
+ *		linux_udf@hpesjro.fc.hp.com
  *
  * COPYRIGHT
  *	This file is distributed under the terms of the GNU General Public
@@ -85,14 +85,14 @@
 #define find_first_one_bit(addr, size)\
 	find_next_one_bit((addr), (size), 0)
 
-static int read_block_bitmap(struct super_block * sb, Uint32 bitmap,
-	unsigned int block, unsigned long bitmap_nr)
+static int read_block_bitmap(struct super_block * sb,
+	struct udf_bitmap *bitmap, unsigned int block, unsigned long bitmap_nr)
 {
 	struct buffer_head *bh = NULL;
 	int retval = 0;
 	lb_addr loc;
 
-	loc.logicalBlockNum = bitmap;
+	loc.logicalBlockNum = bitmap->s_extPosition;
 	loc.partitionReferenceNum = UDF_SB_PARTITION(sb);
 
 	bh = udf_tread(sb, udf_get_lb_pblock(sb, loc, block), sb->s_blocksize);
@@ -100,110 +100,50 @@
 	{
 		retval = -EIO;
 	}
-	UDF_SB_BLOCK_BITMAP_NUMBER(sb, bitmap_nr) = block;
-	UDF_SB_BLOCK_BITMAP(sb, bitmap_nr) = bh;
+	bitmap->s_block_bitmap[bitmap_nr] = bh;
 	return retval;
 }
 
-static int __load_block_bitmap(struct super_block * sb, Uint32 bitmap,
-	unsigned int block_group)
+static int __load_block_bitmap(struct super_block * sb,
+	struct udf_bitmap *bitmap, unsigned int block_group)
 {
-	int i, j, retval = 0;
-	unsigned long block_bitmap_number;
-	struct buffer_head * block_bitmap = NULL;
-	int nr_groups = (UDF_SB_PARTLEN(sb, UDF_SB_PARTITION(sb)) +
-		(sizeof(struct SpaceBitmapDesc) << 3) + (sb->s_blocksize * 8) - 1) / (sb->s_blocksize * 8);
+	int retval = 0;
+	int nr_groups = bitmap->s_nr_groups;
 
 	if (block_group >= nr_groups)
 	{
 		udf_debug("block_group (%d) > nr_groups (%d)\n", block_group, nr_groups);
 	}
 
-	if (nr_groups <= UDF_MAX_BLOCK_LOADED)
+	if (bitmap->s_block_bitmap[block_group])
+		return block_group;
+	else
 	{
-		if (UDF_SB_BLOCK_BITMAP(sb, block_group))
-		{
-			if (UDF_SB_BLOCK_BITMAP_NUMBER(sb, block_group) == block_group)
-				return block_group;
-		}
 		retval = read_block_bitmap(sb, bitmap, block_group, block_group);
 		if (retval < 0)
 			return retval;
 		return block_group;
 	}
-
-	for (i=0; i<UDF_SB_LOADED_BLOCK_BITMAPS(sb) &&
-		UDF_SB_BLOCK_BITMAP_NUMBER(sb, i) != block_group; i++)
-	{
-		;
-	}
-	if (i < UDF_SB_LOADED_BLOCK_BITMAPS(sb) &&
-		UDF_SB_BLOCK_BITMAP_NUMBER(sb, i) == block_group)
-	{
-		block_bitmap_number = UDF_SB_BLOCK_BITMAP_NUMBER(sb, i);
-		block_bitmap = UDF_SB_BLOCK_BITMAP(sb, i);
-		for (j=i; j>0; j--)
-		{
-			UDF_SB_BLOCK_BITMAP_NUMBER(sb, j) = UDF_SB_BLOCK_BITMAP_NUMBER(sb, j-1);
-			UDF_SB_BLOCK_BITMAP(sb, j) = UDF_SB_BLOCK_BITMAP(sb, j-1);
-		}
-		UDF_SB_BLOCK_BITMAP_NUMBER(sb, 0) = block_bitmap_number;
-		UDF_SB_BLOCK_BITMAP(sb, 0) = block_bitmap;
-
-		if (!block_bitmap)
-			retval = read_block_bitmap(sb, bitmap, block_group, 0);
-	}
-	else
-	{
-		if (UDF_SB_LOADED_BLOCK_BITMAPS(sb) < UDF_MAX_BLOCK_LOADED)
-			UDF_SB_LOADED_BLOCK_BITMAPS(sb) ++;
-		else
-			brelse(UDF_SB_BLOCK_BITMAP(sb, UDF_MAX_BLOCK_LOADED-1));
-		for (j=UDF_SB_LOADED_BLOCK_BITMAPS(sb)-1; j>0; j--)
-		{
-			UDF_SB_BLOCK_BITMAP_NUMBER(sb, j) = UDF_SB_BLOCK_BITMAP_NUMBER(sb, j-1);
-			UDF_SB_BLOCK_BITMAP(sb, j) = UDF_SB_BLOCK_BITMAP(sb, j-1);
-		}
-		retval = read_block_bitmap(sb, bitmap, block_group, 0);
-	}
-	return retval;
 }
 
-static inline int load_block_bitmap(struct super_block *sb, Uint32 bitmap,
-	unsigned int block_group)
+static inline int load_block_bitmap(struct super_block *sb,
+	struct udf_bitmap *bitmap, unsigned int block_group)
 {
 	int slot;
-	int nr_groups = (UDF_SB_PARTLEN(sb, UDF_SB_PARTITION(sb)) +
-		(sizeof(struct SpaceBitmapDesc) << 3) + (sb->s_blocksize * 8) - 1) / (sb->s_blocksize * 8);
 
-	if (UDF_SB_LOADED_BLOCK_BITMAPS(sb) > 0 &&
-		UDF_SB_BLOCK_BITMAP_NUMBER(sb, 0) == block_group &&
-		UDF_SB_BLOCK_BITMAP(sb, block_group))
-	{
-		return 0;
-	}
-	else if (nr_groups <= UDF_MAX_BLOCK_LOADED &&
-		UDF_SB_BLOCK_BITMAP_NUMBER(sb, block_group) == block_group &&
-		UDF_SB_BLOCK_BITMAP(sb, block_group))
-	{
-		slot = block_group;
-	}
-	else
-	{
-		slot = __load_block_bitmap(sb, bitmap, block_group);
-	}
+	slot = __load_block_bitmap(sb, bitmap, block_group);
 
 	if (slot < 0)
 		return slot;
 
-	if (!UDF_SB_BLOCK_BITMAP(sb, slot))
+	if (!bitmap->s_block_bitmap[slot])
 		return -EIO;
 
 	return slot;
 }
 
-static void udf_bitmap_free_blocks(const struct inode * inode, Uint32 bitmap,
-	lb_addr bloc, Uint32 offset, Uint32 count)
+static void udf_bitmap_free_blocks(const struct inode * inode,
+	struct udf_bitmap *bitmap, lb_addr bloc, Uint32 offset, Uint32 count)
 {
 	struct buffer_head * bh = NULL;
 	unsigned long block;
@@ -250,7 +190,7 @@
 	if (bitmap_nr < 0)
 		goto error_return;
 
-	bh = UDF_SB_BLOCK_BITMAP(sb, bitmap_nr);
+	bh = bitmap->s_block_bitmap[bitmap_nr];
 	for (i=0; i < count; i++)
 	{
 		if (udf_set_bit(bit + i, bh->b_data))
@@ -283,8 +223,9 @@
 	return;
 }
 
-static int udf_bitmap_prealloc_blocks(const struct inode * inode, Uint32 bitmap,
-	Uint16 partition, Uint32 first_block, Uint32 block_count)
+static int udf_bitmap_prealloc_blocks(const struct inode * inode,
+	struct udf_bitmap *bitmap, Uint16 partition, Uint32 first_block,
+	Uint32 block_count)
 {
 	int alloc_count = 0;
 	int bit, block, block_group, group_start;
@@ -303,6 +244,9 @@
 	if (first_block < 0 || first_block >= UDF_SB_PARTLEN(sb, partition))
 		goto out;
 
+	if (first_block + block_count > UDF_SB_PARTLEN(sb, partition))
+		block_count = UDF_SB_PARTLEN(sb, partition) - first_block;
+
 repeat:
 	nr_groups = (UDF_SB_PARTLEN(sb, partition) +
 		(sizeof(struct SpaceBitmapDesc) << 3) + (sb->s_blocksize * 8) - 1) / (sb->s_blocksize * 8);
@@ -313,7 +257,7 @@
 	bitmap_nr = load_block_bitmap(sb, bitmap, block_group);
 	if (bitmap_nr < 0)
 		goto out;
-	bh = UDF_SB_BLOCK_BITMAP(sb, bitmap_nr);
+	bh = bitmap->s_block_bitmap[bitmap_nr];
 
 	bit = block % (sb->s_blocksize << 3);
 
@@ -349,10 +293,10 @@
 	return alloc_count;
 }
 
-static int udf_bitmap_new_block(const struct inode * inode, Uint32 bitmap,
-	Uint16 partition, Uint32 goal, int *err)
+static int udf_bitmap_new_block(const struct inode * inode,
+	struct udf_bitmap *bitmap, Uint16 partition, Uint32 goal, int *err)
 {
-	int tmp, newbit, bit=0, block, block_group, group_start;
+	int newbit, bit=0, block, block_group, group_start;
 	int end_goal, nr_groups, bitmap_nr, i;
 	struct buffer_head *bh = NULL;
 	struct super_block *sb;
@@ -372,8 +316,7 @@
 	if (goal < 0 || goal >= UDF_SB_PARTLEN(sb, partition))
 		goal = 0;
 
-	nr_groups = (UDF_SB_PARTLEN(sb, partition) +
-		(sizeof(struct SpaceBitmapDesc) << 3) + (sb->s_blocksize * 8) - 1) / (sb->s_blocksize * 8);
+	nr_groups = bitmap->s_nr_groups;
 	block = goal + (sizeof(struct SpaceBitmapDesc) << 3);
 	block_group = block >> (sb->s_blocksize_bits + 3);
 	group_start = block_group ? 0 : sizeof(struct SpaceBitmapDesc);
@@ -381,7 +324,7 @@
 	bitmap_nr = load_block_bitmap(sb, bitmap, block_group);
 	if (bitmap_nr < 0)
 		goto error_return;
-	bh = UDF_SB_BLOCK_BITMAP(sb, bitmap_nr);
+	bh = bitmap->s_block_bitmap[bitmap_nr];
 	ptr = memscan((char *)bh->b_data + group_start, 0xFF, sb->s_blocksize - group_start);
 
 	if ((ptr - ((char *)bh->b_data)) < sb->s_blocksize)
@@ -421,7 +364,7 @@
 		bitmap_nr = load_block_bitmap(sb, bitmap, block_group);
 		if (bitmap_nr < 0)
 			goto error_return;
-		bh = UDF_SB_BLOCK_BITMAP(sb, bitmap_nr);
+		bh = bitmap->s_block_bitmap[bitmap_nr];
 		if (i < nr_groups)
 		{
 			ptr = memscan((char *)bh->b_data + group_start, 0xFF, sb->s_blocksize - group_start);
@@ -471,7 +414,6 @@
 	newblock = bit + (block_group << (sb->s_blocksize_bits + 3)) -
 		(sizeof(struct SpaceBitmapDesc) << 3);
 
-	tmp = udf_get_pblock(sb, newblock, partition, 0);
 	if (!udf_clear_bit(bit, bh->b_data))
 	{
 		udf_debug("bit already cleared for block %d\n", bit);
@@ -497,19 +439,479 @@
 	return 0;
 }
 
+static void udf_table_free_blocks(const struct inode * inode,
+	struct inode * table, lb_addr bloc, Uint32 offset, Uint32 count)
+{
+	struct super_block * sb;
+	Uint32 start, end;
+	Uint32 nextoffset, oextoffset, elen;
+	lb_addr nbloc, obloc, eloc;
+	struct buffer_head *obh, *nbh;
+	char etype;
+	int i;
+
+	udf_debug("ino=%ld, bloc=%d, offset=%d, count=%d\n",
+		inode->i_ino, bloc.logicalBlockNum, offset, count);
+
+	sb = inode->i_sb;
+	if (!sb)
+	{
+		udf_debug("nonexistent device");
+		return;
+	}
+
+	if (table == NULL)
+		return;
+
+	lock_super(sb);
+	if (bloc.logicalBlockNum < 0 ||
+		(bloc.logicalBlockNum + count) > UDF_SB_PARTLEN(sb, bloc.partitionReferenceNum))
+	{
+		udf_debug("%d < %d || %d + %d > %d\n",
+			bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
+			UDF_SB_PARTLEN(sb, bloc.partitionReferenceNum));
+		goto error_return;
+	}
+
+	/* We do this up front - There are some error conditions that could occure,
+	   but.. oh well */
+	DQUOT_FREE_BLOCK(sb, inode, count);
+	if (UDF_SB_LVIDBH(sb))
+	{
+		UDF_SB_LVID(sb)->freeSpaceTable[UDF_SB_PARTITION(sb)] =
+			cpu_to_le32(le32_to_cpu(UDF_SB_LVID(sb)->freeSpaceTable[UDF_SB_PARTITION(sb)])+count);
+		mark_buffer_dirty(UDF_SB_LVIDBH(sb));
+	}
+
+	start = bloc.logicalBlockNum + offset;
+	end = bloc.logicalBlockNum + offset + count - 1;
+
+	oextoffset = nextoffset = sizeof(struct UnallocatedSpaceEntry);
+	elen = 0;
+	obloc = nbloc = UDF_I_LOCATION(table);
+
+	obh = nbh = udf_tread(sb, udf_get_lb_pblock(sb, nbloc, 0), sb->s_blocksize);
+	atomic_inc(&nbh->b_count);
+
+	while (count && (etype =
+		udf_next_aext(table, &nbloc, &nextoffset, &eloc, &elen, &nbh, 1)) != -1)
+	{
+		if (((eloc.logicalBlockNum + (elen >> sb->s_blocksize_bits)) ==
+			start))
+		{
+			if ((0x3FFFFFFF - elen) < (count << sb->s_blocksize_bits))
+			{
+				count -= ((0x3FFFFFFF - elen) >> sb->s_blocksize_bits);
+				start += ((0x3FFFFFFF - elen) >> sb->s_blocksize_bits);
+				elen = (etype << 30) | (0x40000000 - sb->s_blocksize);
+			}
+			else
+			{
+				elen = (etype << 30) |
+					(elen + (count << sb->s_blocksize_bits));
+				start += count;
+				count = 0;
+			}
+			udf_write_aext(table, obloc, &oextoffset, eloc, elen, obh, 1);
+		}
+		else if (eloc.logicalBlockNum == (end + 1))
+		{
+			if ((0x3FFFFFFF - elen) < (count << sb->s_blocksize_bits))
+			{
+				count -= ((0x3FFFFFFF - elen) >> sb->s_blocksize_bits);
+				end -= ((0x3FFFFFFF - elen) >> sb->s_blocksize_bits);
+				eloc.logicalBlockNum -=
+					((0x3FFFFFFF - elen) >> sb->s_blocksize_bits);
+				elen = (etype << 30) | (0x40000000 - sb->s_blocksize);
+			}
+			else
+			{
+				eloc.logicalBlockNum = start;
+				elen = (etype << 30) |
+					(elen + (count << sb->s_blocksize_bits));
+				end -= count;
+				count = 0;
+			}
+			udf_write_aext(table, obloc, &oextoffset, eloc, elen, obh, 1);
+		}
+
+		if (memcmp(&nbloc, &obloc, sizeof(lb_addr)))
+		{
+			i = -1;
+			obloc = nbloc;
+			udf_release_data(obh);
+			atomic_inc(&nbh->b_count);
+			obh = nbh;
+			oextoffset = 0;
+		}
+		else
+			oextoffset = nextoffset;
+	}
+
+	if (count)
+	{
+		/* NOTE: we CANNOT use udf_add_aext here, as it can try to allocate
+				 a new block, and since we hold the super block lock already
+				 very bad things would happen :)
+
+				 We copy the behavior of udf_add_aext, but instead of
+				 trying to allocate a new block close to the existing one,
+				 we just steal a block from the extent we are trying to add.
+
+				 It would be nice if the blocks were close together, but it
+				 isn't required.
+		*/
+
+		int adsize;
+		short_ad *sad = NULL;
+		long_ad *lad = NULL;
+		struct AllocExtDesc *aed;
+
+		eloc.logicalBlockNum = start;
+		elen = (EXTENT_RECORDED_ALLOCATED << 30) |
+			(count << sb->s_blocksize_bits);
+
+		if (UDF_I_ALLOCTYPE(table) == ICB_FLAG_AD_SHORT)
+			adsize = sizeof(short_ad);
+		else if (UDF_I_ALLOCTYPE(table) == ICB_FLAG_AD_LONG)
+			adsize = sizeof(long_ad);
+		else
+		{
+			udf_release_data(obh);
+			udf_release_data(nbh);
+			goto error_return;
+		}
+
+		if (nextoffset + (2 * adsize) > sb->s_blocksize)
+		{
+			char *sptr, *dptr;
+			int loffset;
+	
+			udf_release_data(obh);
+			obh = nbh;
+			obloc = nbloc;
+			oextoffset = nextoffset;
+
+			/* Steal a block from the extent being free'd */
+			nbloc.logicalBlockNum = eloc.logicalBlockNum;
+			eloc.logicalBlockNum ++;
+			elen -= sb->s_blocksize;
+
+			if (!(nbh = udf_tread(sb,
+				udf_get_lb_pblock(sb, nbloc, 0),
+				sb->s_blocksize)))
+			{
+				udf_release_data(obh);
+				goto error_return;
+			}
+			aed = (struct AllocExtDesc *)(nbh->b_data);
+			aed->previousAllocExtLocation = cpu_to_le32(obloc.logicalBlockNum);
+			if (nextoffset + adsize > sb->s_blocksize)
+			{
+				loffset = nextoffset;
+				aed->lengthAllocDescs = cpu_to_le32(adsize);
+				sptr = (obh)->b_data + nextoffset - adsize;
+				dptr = nbh->b_data + sizeof(struct AllocExtDesc);
+				memcpy(dptr, sptr, adsize);
+				nextoffset = sizeof(struct AllocExtDesc) + adsize;
+			}
+			else
+			{
+				loffset = nextoffset + adsize;
+				aed->lengthAllocDescs = cpu_to_le32(0);
+				sptr = (obh)->b_data + nextoffset;
+				nextoffset = sizeof(struct AllocExtDesc);
+	
+				if (memcmp(&UDF_I_LOCATION(table), &obloc, sizeof(lb_addr)))
+				{
+					aed = (struct AllocExtDesc *)(obh)->b_data;
+					aed->lengthAllocDescs =
+						cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) + adsize);
+				}
+				else
+				{
+					UDF_I_LENALLOC(table) += adsize;
+					mark_inode_dirty(table);
+				}
+			}
+			udf_new_tag(nbh->b_data, TID_ALLOC_EXTENT_DESC, 2, 1,
+				nbloc.logicalBlockNum, sizeof(tag));
+			switch (UDF_I_ALLOCTYPE(table))
+			{
+				case ICB_FLAG_AD_SHORT:
+				{
+					sad = (short_ad *)sptr;
+					sad->extLength = cpu_to_le32(
+						EXTENT_NEXT_EXTENT_ALLOCDECS << 30 |
+						sb->s_blocksize);
+					sad->extPosition = cpu_to_le32(nbloc.logicalBlockNum);
+					break;
+				}
+				case ICB_FLAG_AD_LONG:
+				{
+					lad = (long_ad *)sptr;
+					lad->extLength = cpu_to_le32(
+						EXTENT_NEXT_EXTENT_ALLOCDECS << 30 |
+						sb->s_blocksize);
+					lad->extLocation = cpu_to_lelb(nbloc);
+					break;
+				}
+			}
+			udf_update_tag(obh->b_data, loffset);
+			mark_buffer_dirty(obh);
+		}
+
+		if (elen) /* It's possible that stealing the block emptied the extent */
+		{
+			udf_write_aext(table, nbloc, &nextoffset, eloc, elen, nbh, 1);
+
+			if (!memcmp(&UDF_I_LOCATION(table), &nbloc, sizeof(lb_addr)))
+			{
+				UDF_I_LENALLOC(table) += adsize;
+				mark_inode_dirty(table);
+			}
+			else
+			{
+				aed = (struct AllocExtDesc *)nbh->b_data;
+				aed->lengthAllocDescs =
+					cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) + adsize);
+				udf_update_tag(nbh->b_data, nextoffset);
+				mark_buffer_dirty(nbh);
+			}
+		}
+	}
+
+	udf_release_data(nbh);
+	udf_release_data(obh);
+
+error_return:
+	sb->s_dirt = 1;
+	unlock_super(sb);
+	return;
+}
+
+static int udf_table_prealloc_blocks(const struct inode * inode,
+	struct inode *table, Uint16 partition, Uint32 first_block,
+	Uint32 block_count)
+{
+	struct super_block *sb;
+	int alloc_count = 0;
+	Uint32 extoffset, elen, adsize;
+	lb_addr bloc, eloc;
+	struct buffer_head *bh;
+	char etype = -1;
+
+	udf_debug("ino=%ld, partition=%d, first_block=%d, block_count=%d\n",
+		inode->i_ino, partition, first_block, block_count);
+
+	sb = inode->i_sb;
+	if (!sb)
+	{
+		udf_debug("nonexistent device\n");
+		return 0;
+	}
+
+	if (first_block < 0 || first_block >= UDF_SB_PARTLEN(sb, partition))
+		return 0;
+
+	if (table == NULL)
+		return 0;
+
+	if (UDF_I_ALLOCTYPE(table) == ICB_FLAG_AD_SHORT)
+		adsize = sizeof(short_ad);
+	else if (UDF_I_ALLOCTYPE(table) == ICB_FLAG_AD_LONG)
+		adsize = sizeof(long_ad);
+	else
+		return 0;
+
+	lock_super(sb);
+
+	extoffset = sizeof(struct UnallocatedSpaceEntry);
+	bloc = UDF_I_LOCATION(table);
+
+	bh = udf_tread(sb, udf_get_lb_pblock(sb, bloc, 0), sb->s_blocksize);
+	eloc.logicalBlockNum = 0xFFFFFFFF;
+
+	while (first_block != eloc.logicalBlockNum && (etype =
+		udf_next_aext(table, &bloc, &extoffset, &eloc, &elen, &bh, 1)) != -1)
+	{
+		udf_debug("eloc=%d, elen=%d, first_block=%d\n",
+			eloc.logicalBlockNum, elen, first_block);
+		; /* empty loop body */
+	}
+
+	if (first_block == eloc.logicalBlockNum)
+	{
+		extoffset -= adsize;
+
+		alloc_count = (elen >> sb->s_blocksize_bits);
+		if (alloc_count > block_count)
+		{
+			alloc_count = block_count;
+			eloc.logicalBlockNum += alloc_count;
+			elen -= (alloc_count << sb->s_blocksize_bits);
+			udf_write_aext(table, bloc, &extoffset, eloc, (etype << 30) | elen, bh, 1);
+		}
+		else
+			udf_delete_aext(table, bloc, extoffset, eloc, (etype << 30) | elen, bh);
+	}
+	else
+		alloc_count = 0;
+
+	udf_release_data(bh);
+
+	if (alloc_count && UDF_SB_LVIDBH(sb))
+	{
+		UDF_SB_LVID(sb)->freeSpaceTable[partition] =
+			cpu_to_le32(le32_to_cpu(UDF_SB_LVID(sb)->freeSpaceTable[partition])-alloc_count);
+		mark_buffer_dirty(UDF_SB_LVIDBH(sb));
+	}
+	sb->s_dirt = 1;
+	unlock_super(sb);
+	udf_debug("alloc_count=%d\n", alloc_count);
+	return alloc_count;
+}
+
+static int udf_table_new_block(const struct inode * inode,
+	struct inode *table, Uint16 partition, Uint32 goal, int *err)
+{
+	struct super_block *sb;
+	Uint32 spread = 0xFFFFFFFF, nspread;
+	Uint32 newblock = 0, adsize;
+	Uint32 extoffset, goal_extoffset, elen, goal_elen = 0;
+	lb_addr bloc, goal_bloc, eloc, goal_eloc;
+	struct buffer_head *bh, *goal_bh;
+	char etype;
+
+	udf_debug("ino=%ld, partition=%d, goal=%d\n",
+		inode->i_ino, partition, goal);
+
+	*err = -ENOSPC;
+	sb = inode->i_sb;
+	if (!sb)
+	{
+		udf_debug("nonexistent device\n");
+		return newblock;
+	}
+
+	if (table == NULL)
+		return newblock;
+
+	if (UDF_I_ALLOCTYPE(table) == ICB_FLAG_AD_SHORT)
+		adsize = sizeof(short_ad);
+	else if (UDF_I_ALLOCTYPE(table) == ICB_FLAG_AD_LONG)
+		adsize = sizeof(long_ad);
+	else
+		return newblock;
+
+	lock_super(sb);
+
+	if (goal < 0 || goal >= UDF_SB_PARTLEN(sb, partition))
+		goal = 0;
+
+	/* We search for the closest matching block to goal. If we find a exact hit,	   we stop. Otherwise we keep going till we run out of extents.
+	   We store the buffer_head, bloc, and extoffset of the current closest
+	   match and use that when we are done.
+	*/
+
+	extoffset = sizeof(struct UnallocatedSpaceEntry);
+	bloc = UDF_I_LOCATION(table);
+
+	goal_bh = bh = udf_tread(sb, udf_get_lb_pblock(sb, bloc, 0), sb->s_blocksize);
+	atomic_inc(&goal_bh->b_count);
+
+	while (spread && (etype =
+		udf_next_aext(table, &bloc, &extoffset, &eloc, &elen, &bh, 1)) != -1)
+	{
+		if (goal >= eloc.logicalBlockNum)
+		{
+			if (goal < eloc.logicalBlockNum + (elen >> sb->s_blocksize_bits))
+				nspread = 0;
+			else
+				nspread = goal - eloc.logicalBlockNum -
+					(elen >> sb->s_blocksize_bits);
+		}
+		else
+			nspread = eloc.logicalBlockNum - goal;
+
+		if (nspread < spread)
+		{
+			spread = nspread;
+			if (goal_bh != bh)
+			{
+				udf_release_data(goal_bh);
+				goal_bh = bh;
+				atomic_inc(&goal_bh->b_count);
+			}
+			goal_bloc = bloc;
+			goal_extoffset = extoffset - adsize;
+			goal_eloc = eloc;
+			goal_elen = (etype << 30) | elen;
+		}
+	}
+
+	udf_release_data(bh);
+
+	if (spread == 0xFFFFFFFF)
+	{
+		udf_release_data(goal_bh);
+		unlock_super(sb);
+		return 0;
+	}
+
+	/* Only allocate blocks from the beginning of the extent.
+	   That way, we only delete (empty) extents, never have to insert an
+	   extent because of splitting */
+	/* This works, but very poorly.... */
+
+	newblock = goal_eloc.logicalBlockNum;
+	goal_eloc.logicalBlockNum ++;
+	goal_elen -= sb->s_blocksize;
+
+	if (goal_elen)
+		udf_write_aext(table, goal_bloc, &goal_extoffset, goal_eloc, goal_elen, goal_bh, 1);
+	else
+		udf_delete_aext(table, goal_bloc, goal_extoffset, goal_eloc, goal_elen, goal_bh);
+	udf_release_data(goal_bh);
+
+	if (UDF_SB_LVIDBH(sb))
+	{
+		UDF_SB_LVID(sb)->freeSpaceTable[partition] =
+			cpu_to_le32(le32_to_cpu(UDF_SB_LVID(sb)->freeSpaceTable[partition])-1);
+		mark_buffer_dirty(UDF_SB_LVIDBH(sb));
+	}
+
+	sb->s_dirt = 1;
+	unlock_super(sb);
+	*err = 0;
+	return newblock;
+}
+
 inline void udf_free_blocks(const struct inode * inode, lb_addr bloc,
-    Uint32 offset, Uint32 count)
+	Uint32 offset, Uint32 count)
 {
 	if (UDF_SB_PARTFLAGS(inode->i_sb, bloc.partitionReferenceNum) & UDF_PART_FLAG_UNALLOC_BITMAP)
 	{
 		return udf_bitmap_free_blocks(inode,
-			UDF_SB_PARTMAPS(inode->i_sb)[bloc.partitionReferenceNum].s_uspace.bitmap,
+			UDF_SB_PARTMAPS(inode->i_sb)[bloc.partitionReferenceNum].s_uspace.s_bitmap,
+			bloc, offset, count);
+	}
+	else if (UDF_SB_PARTFLAGS(inode->i_sb, bloc.partitionReferenceNum) & UDF_PART_FLAG_UNALLOC_TABLE)
+	{
+		return udf_table_free_blocks(inode,
+			UDF_SB_PARTMAPS(inode->i_sb)[bloc.partitionReferenceNum].s_uspace.s_table,
 			bloc, offset, count);
 	}
 	else if (UDF_SB_PARTFLAGS(inode->i_sb, bloc.partitionReferenceNum) & UDF_PART_FLAG_FREED_BITMAP)
 	{
 		return udf_bitmap_free_blocks(inode,
-			UDF_SB_PARTMAPS(inode->i_sb)[bloc.partitionReferenceNum].s_fspace.bitmap,
+			UDF_SB_PARTMAPS(inode->i_sb)[bloc.partitionReferenceNum].s_fspace.s_bitmap,
+			bloc, offset, count);
+	}
+	else if (UDF_SB_PARTFLAGS(inode->i_sb, bloc.partitionReferenceNum) & UDF_PART_FLAG_FREED_TABLE)
+	{
+		return udf_table_free_blocks(inode,
+			UDF_SB_PARTMAPS(inode->i_sb)[bloc.partitionReferenceNum].s_fspace.s_table,
 			bloc, offset, count);
 	}
 	else
@@ -522,13 +924,25 @@
 	if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_UNALLOC_BITMAP)
 	{
 		return udf_bitmap_prealloc_blocks(inode,
-			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_uspace.bitmap,
+			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_uspace.s_bitmap,
+			partition, first_block, block_count);
+	}
+	else if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_UNALLOC_TABLE)
+	{
+		return udf_table_prealloc_blocks(inode,
+			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_uspace.s_table,
 			partition, first_block, block_count);
 	}
 	else if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_FREED_BITMAP)
 	{
 		return udf_bitmap_prealloc_blocks(inode,
-			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_fspace.bitmap,
+			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_fspace.s_bitmap,
+			partition, first_block, block_count);
+	}
+	else if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_FREED_TABLE)
+	{
+		return udf_table_prealloc_blocks(inode,
+			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_fspace.s_table,
 			partition, first_block, block_count);
 	}
 	else
@@ -541,13 +955,25 @@
 	if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_UNALLOC_BITMAP)
 	{
 		return udf_bitmap_new_block(inode,
-			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_uspace.bitmap,
+			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_uspace.s_bitmap,
+			partition, goal, err);
+	}
+	else if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_UNALLOC_TABLE)
+	{
+		return udf_table_new_block(inode,
+			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_uspace.s_table,
 			partition, goal, err);
 	}
 	else if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_FREED_BITMAP)
 	{
 		return udf_bitmap_new_block(inode,
-			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_fspace.bitmap,
+			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_fspace.s_bitmap,
+			partition, goal, err);
+	}
+	else if (UDF_SB_PARTFLAGS(inode->i_sb, partition) & UDF_PART_FLAG_FREED_TABLE)
+	{
+		return udf_table_new_block(inode,
+			UDF_SB_PARTMAPS(inode->i_sb)[partition].s_fspace.s_table,
 			partition, goal, err);
 	}
 	else
@@ -556,4 +982,3 @@
 		return 0;
 	}
 }
-