+++ /dev/null
-Index: linux-2.6.22.19/include/linux/ext3_fs_i.h
-===================================================================
---- linux-2.6.22.19.orig/include/linux/ext3_fs_i.h
-+++ linux-2.6.22.19/include/linux/ext3_fs_i.h
-@@ -154,6 +154,10 @@ struct ext3_inode_info {
- struct inode vfs_inode;
-
- struct ext3_ext_cache i_cached_extent;
-+
-+ /* mballoc */
-+ struct list_head i_prealloc_list;
-+ spinlock_t i_prealloc_lock;
- };
-
- #endif /* _LINUX_EXT3_FS_I */
-Index: linux-2.6.22.19/include/linux/ext3_fs_sb.h
-===================================================================
---- linux-2.6.22.19.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.22.19/include/linux/ext3_fs_sb.h
-@@ -21,8 +21,15 @@
- #include <linux/wait.h>
- #include <linux/blockgroup_lock.h>
- #include <linux/percpu_counter.h>
-+#include <linux/list.h>
- #endif
- #include <linux/rbtree.h>
-+#include <linux/proc_fs.h>
-+
-+struct ext3_buddy_group_blocks;
-+struct ext3_locality_group;
-+struct ext3_mb_history;
-+#define EXT3_BB_MAX_BLOCKS
-
- /*
- * third extended-fs super-block data in memory
-Index: linux-2.6.22.19/include/linux/ext3_fs.h
-===================================================================
---- linux-2.6.22.19.orig/include/linux/ext3_fs.h
-+++ linux-2.6.22.19/include/linux/ext3_fs.h
-@@ -17,6 +17,7 @@
- #define _LINUX_EXT3_FS_H
-
- #include <linux/types.h>
-+#include <linux/ext3_fs_i.h>
- #include <linux/magic.h>
-
- /*
-@@ -68,12 +69,12 @@
-
- struct ext3_allocation_request {
- struct inode *inode; /* target inode for block we're allocating */
-- unsigned long logical; /* logical block in target inode */
-- unsigned long goal; /* phys. target (a hint) */
-- unsigned long lleft; /* the closest logical allocated block to the left */
-- unsigned long pleft; /* phys. block for ^^^ */
-- unsigned long lright; /* the closest logical allocated block to the right */
-- unsigned long pright; /* phys. block for ^^^ */
-+ ext3_fsblk_t logical; /* logical block in target inode */
-+ ext3_fsblk_t goal; /* phys. target (a hint) */
-+ ext3_fsblk_t lleft; /* the closest logical allocated block to the left */
-+ ext3_fsblk_t pleft; /* phys. block for ^^^ */
-+ ext3_fsblk_t lright; /* the closest logical allocated block to the right */
-+ ext3_fsblk_t pright; /* phys. block for ^^^ */
- unsigned long len; /* how many blocks we want to allocate */
- unsigned long flags; /* flags. see above EXT3_MB_HINT_* */
- };
-@@ -414,6 +415,7 @@ struct ext3_inode {
- #define EXT3_MOUNT_IOPEN_NOPRIV 0x800000/* Make iopen world-readable */
- #define EXT3_MOUNT_EXTENTS 0x2000000/* Extents support */
- #define EXT3_MOUNT_EXTDEBUG 0x4000000/* Extents debug */
-+#define EXT3_MOUNT_MBALLOC 0x8000000/* Buddy allocation support */
-
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef clear_opt
-@@ -801,12 +803,12 @@ ext3_group_first_block_no(struct super_b
- /* balloc.c */
- extern int ext3_bg_has_super(struct super_block *sb, int group);
- extern unsigned long ext3_bg_num_gdb(struct super_block *sb, int group);
--extern ext3_fsblk_t ext3_new_block (handle_t *handle, struct inode *inode,
-+extern ext3_fsblk_t ext3_new_block_old (handle_t *handle, struct inode *inode,
- ext3_fsblk_t goal, int *errp);
--extern ext3_fsblk_t ext3_new_blocks (handle_t *handle, struct inode *inode,
-+extern ext3_fsblk_t ext3_new_blocks_old (handle_t *handle, struct inode *inode,
- ext3_fsblk_t goal, unsigned long *count, int *errp);
- extern void ext3_free_blocks (handle_t *handle, struct inode *inode,
-- ext3_fsblk_t block, unsigned long count);
-+ ext3_fsblk_t block, unsigned long count, int metadata);
- extern void ext3_free_blocks_sb (handle_t *handle, struct super_block *sb,
- ext3_fsblk_t block, unsigned long count,
- unsigned long *pdquot_freed_blocks);
-@@ -850,15 +852,45 @@ extern long ext3_mb_stats;
- extern long ext3_mb_max_to_scan;
- extern int ext3_mb_init(struct super_block *, int);
- extern int ext3_mb_release(struct super_block *);
--extern unsigned long ext3_mb_new_blocks(handle_t *, struct ext3_allocation_request *, int *);
-+extern ext3_fsblk_t ext3_new_block(handle_t *handle, struct inode *inode,
-+ ext3_fsblk_t goal, int *errp);
-+extern ext3_fsblk_t ext3_mb_new_blocks(handle_t *,
-+ struct ext3_allocation_request *, int *);
- extern int ext3_mb_reserve_blocks(struct super_block *, int);
- extern void ext3_mb_release_blocks(struct super_block *, int);
- extern void ext3_mb_release_blocks(struct super_block *, int);
- extern void ext3_mb_discard_inode_preallocations(struct inode *);
- extern int __init init_ext3_mb_proc(void);
- extern void exit_ext3_mb_proc(void);
--extern void ext3_mb_free_blocks(handle_t *, struct inode *, unsigned long, unsigned long, int, int *);
-+extern void ext3_mb_free_blocks(handle_t *, struct inode *, unsigned long,
-+ unsigned long, int, unsigned long *);
-+
-+static inline ext3_fsblk_t ext3_new_blocks(handle_t *handle,
-+ struct inode *inode,
-+ ext3_fsblk_t goal,
-+ unsigned long *count, int *errp)
-+{
-+ struct ext3_allocation_request ar;
-+ ext3_fsblk_t ret;
-
-+ if (!test_opt(inode->i_sb, MBALLOC)) {
-+ ret = ext3_new_blocks_old(handle, inode, goal, count, errp);
-+ return ret;
-+ }
-+
-+ ar.inode = inode;
-+ ar.goal = goal;
-+ ar.len = *count;
-+ ar.logical = 0;
-+ ar.lleft = 0;
-+ ar.pleft = 0;
-+ ar.lright = 0;
-+ ar.pright = 0;
-+ ar.flags = 0;
-+ ret = ext3_mb_new_blocks(handle, &ar, errp);
-+ *count = ar.len;
-+ return ret;
-+}
-
- /* inode.c */
- int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode,
-Index: linux-2.6.22.19/fs/ext3/super.c
-===================================================================
---- linux-2.6.22.19.orig/fs/ext3/super.c
-+++ linux-2.6.22.19/fs/ext3/super.c
-@@ -685,6 +685,7 @@ enum {
- Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
- Opt_grpquota,
- Opt_extents, Opt_noextents, Opt_extdebug,
-+ Opt_mballoc, Opt_nomballoc, Opt_stripe,
- };
-
- static match_table_t tokens = {
-@@ -740,6 +741,9 @@ static match_table_t tokens = {
- {Opt_extents, "extents"},
- {Opt_noextents, "noextents"},
- {Opt_extdebug, "extdebug"},
-+ {Opt_mballoc, "mballoc"},
-+ {Opt_nomballoc, "nomballoc"},
-+ {Opt_stripe, "stripe=%u"},
- {Opt_err, NULL},
- {Opt_resize, "resize"},
- };
-@@ -1093,6 +1097,19 @@ clear_qf_name:
- case Opt_extdebug:
- set_opt (sbi->s_mount_opt, EXTDEBUG);
- break;
-+ case Opt_mballoc:
-+ set_opt(sbi->s_mount_opt, MBALLOC);
-+ break;
-+ case Opt_nomballoc:
-+ clear_opt(sbi->s_mount_opt, MBALLOC);
-+ break;
-+ case Opt_stripe:
-+ if (match_int(&args[0], &option))
-+ return 0;
-+ if (option < 0)
-+ return 0;
-+ sbi->s_stripe = option;
-+ break;
- default:
- printk (KERN_ERR
- "EXT3-fs: Unrecognized mount option \"%s\" "
-@@ -1832,6 +1849,7 @@ static int ext3_fill_super (struct super
- "writeback");
-
- ext3_ext_init(sb);
-+ ext3_mb_init(sb, needs_recovery);
-
- lock_kernel();
- return 0;
-Index: linux-2.6.22.19/fs/ext3/extents.c
-===================================================================
---- linux-2.6.22.19.orig/fs/ext3/extents.c
-+++ linux-2.6.22.19/fs/ext3/extents.c
-@@ -801,7 +801,7 @@ cleanup:
- for (i = 0; i < depth; i++) {
- if (!ablocks[i])
- continue;
-- ext3_free_blocks(handle, inode, ablocks[i], 1);
-+ ext3_free_blocks(handle, inode, ablocks[i], 1, 1);
- }
- }
- kfree(ablocks);
-@@ -1619,7 +1619,7 @@ int ext3_ext_rm_idx(handle_t *handle, st
- ext_debug(inode, "index is empty, remove it, free block %lu\n", leaf);
- bh = sb_find_get_block(inode->i_sb, leaf);
- ext3_forget(handle, 1, inode, bh, leaf);
-- ext3_free_blocks(handle, inode, leaf, 1);
-+ ext3_free_blocks(handle, inode, leaf, 1, 1);
- return err;
- }
-
-@@ -1678,7 +1678,7 @@ static int ext3_remove_blocks(handle_t *
- unsigned long from, unsigned long to)
- {
- struct buffer_head *bh;
-- int i;
-+ int i, metadata = 0;
-
- #ifdef EXTENTS_STATS
- {
-@@ -1696,6 +1696,8 @@ static int ext3_remove_blocks(handle_t *
- spin_unlock(&sbi->s_ext_stats_lock);
- }
- #endif
-+ if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))
-+ metadata = 1;
- if (from >= le32_to_cpu(ex->ee_block)
- && to == le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len) - 1) {
- /* tail removal */
-@@ -1707,7 +1709,7 @@ static int ext3_remove_blocks(handle_t *
- bh = sb_find_get_block(inode->i_sb, start + i);
- ext3_forget(handle, 0, inode, bh, start + i);
- }
-- ext3_free_blocks(handle, inode, start, num);
-+ ext3_free_blocks(handle, inode, start, num, metadata);
- } else if (from == le32_to_cpu(ex->ee_block)
- && to <= le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len) - 1) {
- printk("strange request: removal %lu-%lu from %u:%u\n",
-@@ -2040,7 +2042,7 @@ int ext3_ext_get_blocks(handle_t *handle
- struct ext3_extent newex, *ex;
- int goal, newblock, err = 0, depth;
- unsigned long allocated = 0;
-- unsigned long next;
-+ struct ext3_allocation_request ar;
-
- __clear_bit(BH_New, &bh_result->b_state);
- ext_debug(inode, "blocks %d/%lu requested for inode %u\n", (int) iblock,
-@@ -2122,18 +2124,36 @@ int ext3_ext_get_blocks(handle_t *handle
- if (S_ISREG(inode->i_mode) && (!EXT3_I(inode)->i_block_alloc_info))
- ext3_init_block_alloc_info(inode);
-
-+ /* find neighbour allocated blocks */
-+ ar.lleft = iblock;
-+ err = ext3_ext_search_left(inode, path, &ar.lleft, &ar.pleft);
-+ if (err)
-+ goto out2;
-+ ar.lright = iblock;
-+ err = ext3_ext_search_right(inode, path, &ar.lright, &ar.pright);
-+ if (err)
-+ goto out2;
-+
- /* find next allocated block so that we know how many
- * blocks we can allocate without ovelapping next extent */
-- BUG_ON(iblock < le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len));
-- next = ext3_ext_next_allocated_block(path);
-- BUG_ON(next <= iblock);
-- allocated = next - iblock;
-+ BUG_ON(ar.pright != 0 && ar.lright <= iblock);
-+ if (ar.pright == 0)
-+ allocated = EXT_MAX_BLOCK - iblock;
-+ else
-+ allocated = ar.lright - iblock;
- if (allocated > max_blocks)
- allocated = max_blocks;
-
- /* allocate new block */
-- goal = ext3_ext_find_goal(inode, path, iblock);
-- newblock = ext3_new_blocks(handle, inode, goal, &allocated, &err);
-+ ar.inode = inode;
-+ ar.goal = ext3_ext_find_goal(inode, path, iblock);
-+ ar.logical = iblock;
-+ ar.len = allocated;
-+ if (S_ISREG(inode->i_mode))
-+ ar.flags = EXT3_MB_HINT_DATA;
-+ else
-+ ar.flags = 0;
-+ newblock = ext3_mb_new_blocks(handle, &ar, &err);
- if (!newblock)
- goto out2;
- ext_debug(inode, "allocate new block: goal %d, found %d/%lu\n",
-@@ -2143,12 +2163,16 @@ int ext3_ext_get_blocks(handle_t *handle
- newex.ee_block = cpu_to_le32(iblock);
- newex.ee_start = cpu_to_le32(newblock);
- newex.ee_start_hi = 0;
-- newex.ee_len = cpu_to_le16(allocated);
-+ newex.ee_len = cpu_to_le16(ar.len);
- err = ext3_ext_insert_extent(handle, inode, path, &newex);
- if (err) {
- /* free data blocks we just allocated */
-- ext3_free_blocks(handle, inode, le32_to_cpu(newex.ee_start),
-- le16_to_cpu(newex.ee_len));
-+ /* not a good idea to call discard here directly,
-+ * but otherwise we'd need to call it every free() */
-+ ext3_mb_discard_inode_preallocations(inode);
-+ ext3_free_blocks(handle, inode, newex.ee_start,
-+ newex.ee_len, 0);
-+
- goto out2;
- }
-
-@@ -2157,6 +2181,7 @@ int ext3_ext_get_blocks(handle_t *handle
-
- /* previous routine could use block we allocated */
- newblock = le32_to_cpu(newex.ee_start);
-+ allocated = le16_to_cpu(newex.ee_len);
- __set_bit(BH_New, &bh_result->b_state);
-
- ext3_ext_put_in_cache(inode, iblock, allocated, newblock,
-@@ -2208,6 +2233,9 @@ void ext3_ext_truncate(struct inode * in
- mutex_lock(&EXT3_I(inode)->truncate_mutex);
- ext3_ext_invalidate_cache(inode);
-
-+ /* it's important to discard preallocations under truncate_mutex */
-+ ext3_mb_discard_inode_preallocations(inode);
-+
- /*
- * TODO: optimization is possible here
- * probably we need not scaning at all,
-Index: linux-2.6.22.19/fs/ext3/Makefile
-===================================================================
---- linux-2.6.22.19.orig/fs/ext3/Makefile
-+++ linux-2.6.22.19/fs/ext3/Makefile
-@@ -6,7 +6,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o
-
- ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
- ioctl.o namei.o super.o symlink.o hash.o resize.o ext3_jbd.o \
-- extents.o
-+ extents.o mballoc.o
-
- ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
- ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
-Index: linux-2.6.22.19/fs/ext3/xattr.c
-===================================================================
---- linux-2.6.22.19.orig/fs/ext3/xattr.c
-+++ linux-2.6.22.19/fs/ext3/xattr.c
-@@ -488,7 +488,7 @@ ext3_xattr_release_block(handle_t *handl
- ea_bdebug(bh, "refcount now=0; freeing");
- if (ce)
- mb_cache_entry_free(ce);
-- ext3_free_blocks(handle, inode, bh->b_blocknr, 1);
-+ ext3_free_blocks(handle, inode, bh->b_blocknr, 1, 1);
- get_bh(bh);
- ext3_forget(handle, 1, inode, bh, bh->b_blocknr);
- } else {
-@@ -813,7 +813,7 @@ inserted:
- new_bh = sb_getblk(sb, block);
- if (!new_bh) {
- getblk_failed:
-- ext3_free_blocks(handle, inode, block, 1);
-+ ext3_free_blocks(handle, inode, block, 1, 1);
- error = -EIO;
- goto cleanup;
- }
-Index: linux-2.6.22.19/fs/ext3/balloc.c
-===================================================================
---- linux-2.6.22.19.orig/fs/ext3/balloc.c
-+++ linux-2.6.22.19/fs/ext3/balloc.c
-@@ -90,7 +90,7 @@ struct ext3_group_desc * ext3_get_group_
- *
- * Return buffer_head on success or NULL in case of failure.
- */
--static struct buffer_head *
-+struct buffer_head *
- read_block_bitmap(struct super_block *sb, unsigned int block_group)
- {
- struct ext3_group_desc * desc;
-@@ -391,6 +391,8 @@ void ext3_discard_reservation(struct ino
- struct ext3_reserve_window_node *rsv;
- spinlock_t *rsv_lock = &EXT3_SB(inode->i_sb)->s_rsv_window_lock;
-
-+ ext3_mb_discard_inode_preallocations(inode);
-+
- if (!block_i)
- return;
-
-@@ -602,19 +604,24 @@ error_return:
- * @count: number of blocks to count
- */
- void ext3_free_blocks(handle_t *handle, struct inode *inode,
-- ext3_fsblk_t block, unsigned long count)
-+ ext3_fsblk_t block, unsigned long count, int metadata)
- {
-- struct super_block * sb;
-- unsigned long dquot_freed_blocks;
-+ struct super_block *sb;
-+ unsigned long freed;
-+
-+ /* this isn't the right place to decide whether block is metadata
-+ * inode.c/extents.c knows better, but for safety ... */
-+ if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode) ||
-+ ext3_should_journal_data(inode))
-+ metadata = 1;
-
- sb = inode->i_sb;
-- if (!sb) {
-- printk ("ext3_free_blocks: nonexistent device");
-- return;
-- }
-- ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
-- if (dquot_freed_blocks)
-- DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
-+ if (!test_opt(sb, MBALLOC) || !EXT3_SB(sb)->s_group_info)
-+ ext3_free_blocks_sb(handle, sb, block, count, &freed);
-+ else
-+ ext3_mb_free_blocks(handle, inode, block, count, metadata, &freed);
-+ if (freed)
-+ DQUOT_FREE_BLOCK(inode, freed);
- return;
- }
-
-@@ -1403,7 +1410,7 @@ int ext3_should_retry_alloc(struct super
- * any specific goal block.
- *
- */
--ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode,
-+ext3_fsblk_t ext3_new_blocks_old(handle_t *handle, struct inode *inode,
- ext3_fsblk_t goal, unsigned long *count, int *errp)
- {
- struct buffer_head *bitmap_bh = NULL;
-@@ -1666,7 +1673,7 @@ out:
- return 0;
- }
-
--ext3_fsblk_t ext3_new_block(handle_t *handle, struct inode *inode,
-+ext3_fsblk_t ext3_new_block_old(handle_t *handle, struct inode *inode,
- ext3_fsblk_t goal, int *errp)
- {
- unsigned long count = 1;
-Index: linux-2.6.22.19/fs/ext3/inode.c
-===================================================================
---- linux-2.6.22.19.orig/fs/ext3/inode.c
-+++ linux-2.6.22.19/fs/ext3/inode.c
-@@ -560,7 +560,7 @@ static int ext3_alloc_blocks(handle_t *h
- return ret;
- failed_out:
- for (i = 0; i <index; i++)
-- ext3_free_blocks(handle, inode, new_blocks[i], 1);
-+ ext3_free_blocks(handle, inode, new_blocks[i], 1, 0);
- return ret;
- }
-
-@@ -659,9 +659,9 @@ failed:
- ext3_journal_forget(handle, branch[i].bh);
- }
- for (i = 0; i <indirect_blks; i++)
-- ext3_free_blocks(handle, inode, new_blocks[i], 1);
-+ ext3_free_blocks(handle, inode, new_blocks[i], 1, 0);
-
-- ext3_free_blocks(handle, inode, new_blocks[i], num);
-+ ext3_free_blocks(handle, inode, new_blocks[i], num, 0);
-
- return err;
- }
-@@ -758,9 +758,10 @@ err_out:
- for (i = 1; i <= num; i++) {
- BUFFER_TRACE(where[i].bh, "call journal_forget");
- ext3_journal_forget(handle, where[i].bh);
-- ext3_free_blocks(handle,inode,le32_to_cpu(where[i-1].key),1);
-+ ext3_free_blocks(handle,inode,le32_to_cpu(where[i-1].key), 1,
-+ 0);
- }
-- ext3_free_blocks(handle, inode, le32_to_cpu(where[num].key), blks);
-+ ext3_free_blocks(handle, inode, le32_to_cpu(where[num].key), blks, 0);
-
- return err;
- }
-@@ -1988,7 +1989,7 @@ static void ext3_clear_blocks(handle_t *
- }
- }
-
-- ext3_free_blocks(handle, inode, block_to_free, count);
-+ ext3_free_blocks(handle, inode, block_to_free, count, 0);
- }
-
- /**
-@@ -2161,7 +2162,7 @@ static void ext3_free_branches(handle_t
- ext3_journal_test_restart(handle, inode);
- }
-
-- ext3_free_blocks(handle, inode, nr, 1);
-+ ext3_free_blocks(handle, inode, nr, 1, 1);
-
- if (parent_bh) {
- /*
-Index: linux-2.6.22.19/fs/ext3/mballoc.c
-===================================================================
---- linux-2.6.22.19.orig/fs/ext3/mballoc.c
-+++ linux-2.6.22.19/fs/ext3/mballoc.c
-@@ -305,7 +305,7 @@
- */
- #define MB_DEFAULT_STRIPE 256
-
--static kmem_cache_t *ext3_pspace_cachep = NULL;
-+static struct kmem_cache *ext3_pspace_cachep = NULL;
-
- #ifdef EXT3_BB_MAX_BLOCKS
- #undef EXT3_BB_MAX_BLOCKS
-@@ -350,8 +350,8 @@ struct ext3_prealloc_space {
- spinlock_t pa_lock;
- atomic_t pa_count;
- unsigned pa_deleted;
-- unsigned long pa_pstart; /* phys. block */
-- unsigned long pa_lstart; /* log. block */
-+ ext3_fsblk_t pa_pstart; /* phys. block */
-+ ext3_fsblk_t pa_lstart; /* log. block */
- unsigned short pa_len; /* len of preallocated chunk */
- unsigned short pa_free; /* how many blocks are free */
- unsigned short pa_linear; /* consumed in one direction
-@@ -460,8 +460,8 @@ static struct proc_dir_entry *proc_root_
-
- int ext3_create (struct inode *, struct dentry *, int, struct nameidata *);
- struct buffer_head * read_block_bitmap(struct super_block *, unsigned int);
--unsigned long ext3_new_blocks_old(handle_t *handle, struct inode *inode,
-- unsigned long goal, unsigned long *count, int *errp);
-+ext3_fsblk_t ext3_new_blocks_old(handle_t *handle, struct inode *inode,
-+ ext3_fsblk_t goal, unsigned long *count, int *errp);
- void ext3_mb_release_blocks(struct super_block *, int);
- void ext3_mb_poll_new_transaction(struct super_block *, handle_t *);
- void ext3_mb_free_committed_blocks(struct super_block *);
-@@ -479,7 +479,7 @@ int ext3_mb_destroy_per_dev_proc(struct
- * Calculate the block group number and offset, given a block number
- */
- static void ext3_get_group_no_and_offset(struct super_block *sb,
-- unsigned long blocknr,
-+ ext3_fsblk_t blocknr,
- unsigned long *blockgrpp,
- unsigned long *offsetp)
- {
-@@ -517,12 +517,12 @@ ext3_is_group_locked(struct super_block
- &EXT3_GROUP_INFO(sb, group)->bb_state);
- }
-
--unsigned long ext3_grp_offs_to_block(struct super_block *sb,
-+ext3_fsblk_t ext3_grp_offs_to_block(struct super_block *sb,
- struct ext3_free_extent *fex)
- {
-- unsigned long block;
-+ ext3_fsblk_t block;
-
-- block = (unsigned long) fex->fe_group * EXT3_BLOCKS_PER_GROUP(sb)
-+ block = (ext3_fsblk_t) fex->fe_group * EXT3_BLOCKS_PER_GROUP(sb)
- + fex->fe_start
- + le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block);
- return block;
-@@ -3202,7 +3202,7 @@ void ext3_mb_collect_stats(struct ext3_a
- void ext3_mb_use_inode_pa(struct ext3_allocation_context *ac,
- struct ext3_prealloc_space *pa)
- {
-- unsigned long start, len;
-+ ext3_fsblk_t start, len;
-
- /* found preallocated blocks, use them */
- start = pa->pa_pstart + (ac->ac_o_ex.fe_logical - pa->pa_lstart);
-@@ -4053,13 +4053,13 @@ int ext3_mb_discard_preallocations(struc
- * it tries to use preallocation first, then falls back
- * to usual allocation
- */
--unsigned long ext3_mb_new_blocks(handle_t *handle,
-+ext3_fsblk_t ext3_mb_new_blocks(handle_t *handle,
- struct ext3_allocation_request *ar, int *errp)
- {
- struct ext3_allocation_context ac;
- struct ext3_sb_info *sbi;
- struct super_block *sb;
-- unsigned long block = 0;
-+ ext3_fsblk_t block = 0;
- int freed, inquota;
-
- sb = ar->inode->i_sb;
-@@ -4070,8 +4070,8 @@ unsigned long ext3_mb_new_blocks(handle_
- if (ext3_mballoc_warning++ == 0)
- printk(KERN_ERR "EXT3-fs: multiblock request with "
- "mballoc disabled!\n");
-- ar->len = 1;
-- block = ext3_new_block_old(handle, ar->inode, ar->goal, errp);
-+ block = ext3_new_blocks_old(handle, ar->inode, ar->goal,
-+ &ar->len, errp);
- return block;
- }
-
-@@ -4135,11 +4135,11 @@ out:
- }
- EXPORT_SYMBOL(ext3_mb_new_blocks);
-
--int ext3_new_block(handle_t *handle, struct inode *inode,
-- unsigned long goal, int *errp)
-+ext3_fsblk_t ext3_new_block(handle_t *handle, struct inode *inode,
-+ ext3_fsblk_t goal, int *errp)
- {
- struct ext3_allocation_request ar;
-- unsigned long ret;
-+ ext3_fsblk_t ret;
-
- if (!test_opt(inode->i_sb, MBALLOC)) {
- ret = ext3_new_block_old(handle, inode, goal, errp);
-@@ -4254,8 +4254,8 @@ int ext3_mb_free_metadata(handle_t *hand
- * Main entry point into mballoc to free blocks
- */
- void ext3_mb_free_blocks(handle_t *handle, struct inode *inode,
-- unsigned long block, unsigned long count,
-- int metadata, int *freed)
-+ ext3_fsblk_t block, unsigned long count,
-+ int metadata, unsigned long *freed)
- {
- struct buffer_head *bitmap_bh = NULL;
- struct super_block *sb = inode->i_sb;