1 Index: linux-2.6.9/include/linux/ext3_fs_i.h
2 ===================================================================
3 --- linux-2.6.9.orig/include/linux/ext3_fs_i.h
4 +++ linux-2.6.9/include/linux/ext3_fs_i.h
5 @@ -130,6 +130,10 @@ struct ext3_inode_info {
6 struct inode vfs_inode;
8 __u32 i_cached_extent[4];
11 + struct list_head i_prealloc_list;
12 + spinlock_t i_prealloc_lock;
15 #endif /* _LINUX_EXT3_FS_I */
16 Index: linux-2.6.9/include/linux/ext3_fs_sb.h
17 ===================================================================
18 --- linux-2.6.9.orig/include/linux/ext3_fs_sb.h
19 +++ linux-2.6.9/include/linux/ext3_fs_sb.h
22 #include <linux/blockgroup_lock.h>
23 #include <linux/percpu_counter.h>
24 +#include <linux/list.h>
27 #include <linux/rbtree.h>
28 +#include <linux/proc_fs.h>
30 +struct ext3_buddy_group_blocks;
31 +struct ext3_locality_group;
32 +struct ext3_mb_history;
33 +#define EXT3_BB_MAX_BLOCKS
36 * third extended-fs super-block data in memory
37 Index: linux-2.6.9/include/linux/ext3_fs.h
38 ===================================================================
39 --- linux-2.6.9.orig/include/linux/ext3_fs.h
40 +++ linux-2.6.9/include/linux/ext3_fs.h
41 @@ -389,6 +389,7 @@ struct ext3_inode {
42 #define EXT3_MOUNT_IOPEN_NOPRIV 0x100000/* Make iopen world-readable */
43 #define EXT3_MOUNT_EXTENTS 0x200000/* Extents support */
44 #define EXT3_MOUNT_EXTDEBUG 0x400000/* Extents debug */
45 +#define EXT3_MOUNT_MBALLOC 0x800000/* Buddy allocation support */
47 /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
49 @@ -757,8 +758,9 @@ struct dir_private_info {
50 extern int ext3_bg_has_super(struct super_block *sb, int group);
51 extern unsigned long ext3_bg_num_gdb(struct super_block *sb, int group);
52 extern int ext3_new_block (handle_t *, struct inode *, unsigned long, int *);
53 +extern int ext3_new_block_old (handle_t *, struct inode *, unsigned long, int *);
54 extern void ext3_free_blocks (handle_t *, struct inode *, unsigned long,
56 + unsigned long, int);
57 extern void ext3_free_blocks_sb (handle_t *, struct super_block *,
58 unsigned long, unsigned long, int *);
59 extern unsigned long ext3_count_free_blocks (struct super_block *);
60 Index: linux-2.6.9/fs/ext3/super.c
61 ===================================================================
62 --- linux-2.6.9.orig/fs/ext3/super.c
63 +++ linux-2.6.9/fs/ext3/super.c
64 @@ -642,6 +642,7 @@ enum {
65 Opt_ignore, Opt_barrier, Opt_err, Opt_resize,
66 Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
67 Opt_extents, Opt_noextents, Opt_extdebug,
68 + Opt_mballoc, Opt_nomballoc, Opt_stripe,
71 static match_table_t tokens = {
72 @@ -695,6 +696,9 @@ static match_table_t tokens = {
73 {Opt_noextents, "noextents"},
74 {Opt_extdebug, "extdebug"},
75 {Opt_barrier, "barrier=%u"},
76 + {Opt_mballoc, "mballoc"},
77 + {Opt_nomballoc, "nomballoc"},
78 + {Opt_stripe, "stripe=%u"},
80 {Opt_resize, "resize"},
82 @@ -1007,6 +1011,19 @@ clear_qf_name:
84 set_opt (sbi->s_mount_opt, EXTDEBUG);
87 + set_opt(sbi->s_mount_opt, MBALLOC);
90 + clear_opt(sbi->s_mount_opt, MBALLOC);
93 + if (match_int(&args[0], &option))
97 + sbi->s_stripe = option;
101 "EXT3-fs: Unrecognized mount option \"%s\" "
102 @@ -1696,6 +1713,7 @@ static int ext3_fill_super (struct super
103 ext3_count_dirs(sb));
106 + ext3_mb_init(sb, needs_recovery);
110 Index: linux-2.6.9/fs/ext3/extents.c
111 ===================================================================
112 --- linux-2.6.9.orig/fs/ext3/extents.c
113 +++ linux-2.6.9/fs/ext3/extents.c
114 @@ -820,7 +820,7 @@ cleanup:
115 for (i = 0; i < depth; i++) {
118 - ext3_free_blocks(handle, tree->inode, ablocks[i], 1);
119 + ext3_free_blocks(handle, tree->inode, ablocks[i], 1, 1);
123 @@ -1630,7 +1630,7 @@ int ext3_ext_rm_idx(handle_t *handle, st
124 path->p_idx->ei_leaf);
125 bh = sb_find_get_block(tree->inode->i_sb, path->p_idx->ei_leaf);
126 ext3_forget(handle, 1, tree->inode, bh, path->p_idx->ei_leaf);
127 - ext3_free_blocks(handle, tree->inode, path->p_idx->ei_leaf, 1);
128 + ext3_free_blocks(handle, tree->inode, path->p_idx->ei_leaf, 1, 1);
132 @@ -2129,10 +2129,12 @@ ext3_remove_blocks(struct ext3_extents_t
133 int needed = ext3_remove_blocks_credits(tree, ex, from, to);
134 handle_t *handle = ext3_journal_start(tree->inode, needed);
135 struct buffer_head *bh;
137 + int i, metadata = 0;
140 return PTR_ERR(handle);
141 + if (S_ISDIR(tree->inode->i_mode) || S_ISLNK(tree->inode->i_mode))
143 if (from >= ex->ee_block && to == ex->ee_block + ex->ee_len - 1) {
145 unsigned long num, start;
146 @@ -2144,7 +2146,7 @@ ext3_remove_blocks(struct ext3_extents_t
147 bh = sb_find_get_block(tree->inode->i_sb, start + i);
148 ext3_forget(handle, 0, tree->inode, bh, start + i);
150 - ext3_free_blocks(handle, tree->inode, start, num);
151 + ext3_free_blocks(handle, tree->inode, start, num, metadata);
152 } else if (from == ex->ee_block && to <= ex->ee_block + ex->ee_len - 1) {
153 printk("strange request: removal %lu-%lu from %u:%u\n",
154 from, to, ex->ee_block, ex->ee_len);
155 @@ -2235,11 +2237,8 @@ int ext3_ext_get_block(handle_t *handle,
156 struct ext3_extent *ex;
157 int goal, newblock, err = 0, depth;
158 struct ext3_extents_tree tree;
159 - unsigned long next;
162 - /* until we have multiblock allocation */
164 + unsigned long allocated = 0;
165 + struct ext3_allocation_request ar;
167 clear_buffer_new(bh_result);
168 ext3_init_tree_desc(&tree, inode);
169 @@ -2311,18 +2310,36 @@ int ext3_ext_get_block(handle_t *handle,
173 + /* find neighbour allocated blocks */
175 + err = ext3_ext_search_left(&tree, path, &ar.lleft, &ar.pleft);
178 + ar.lright = iblock;
179 + err = ext3_ext_search_right(&tree, path, &ar.lright, &ar.pright);
183 /* find next allocated block so that we know how many
184 * blocks we can allocate without ovelapping next extent */
185 - EXT_ASSERT(iblock >= ex->ee_block + ex->ee_len);
186 - next = ext3_ext_next_allocated_block(path);
187 - EXT_ASSERT(next > iblock);
188 - allocated = next - iblock;
189 + EXT_ASSERT(ar.pright == 0 || ar.lright > iblock);
190 + if (ar.pright == 0)
191 + allocated = EXT_MAX_BLOCK - iblock;
193 + allocated = ar.lright - iblock;
194 if (allocated > max_blocks)
195 allocated = max_blocks;
197 /* allocate new block */
198 - goal = ext3_ext_find_goal(inode, path, iblock);
199 - newblock = ext3_new_block(handle, inode, goal, &err);
201 + ar.goal = ext3_ext_find_goal(inode, path, iblock);
202 + ar.logical = iblock;
203 + ar.len = allocated;
204 + if (S_ISREG(inode->i_mode))
205 + ar.flags = EXT3_MB_HINT_DATA;
208 + newblock = ext3_mb_new_blocks(handle, &ar, &err);
211 ext_debug(&tree, "allocate new block: goal %d, found %d\n",
212 @@ -2332,11 +2349,14 @@ int ext3_ext_get_block(handle_t *handle,
213 newex.ee_block = iblock;
214 newex.ee_start = newblock;
215 newex.ee_start_hi = 0;
217 + newex.ee_len = ar.len;
218 err = ext3_ext_insert_extent(handle, &tree, path, &newex);
220 /* free data blocks we just allocated */
221 - ext3_free_blocks(handle, inode, newex.ee_start, newex.ee_len);
222 + /* not a good idea to call discard here directly,
223 + * but otherwise we'd need to call it every free() */
224 + ext3_mb_discard_inode_preallocations(inode);
225 + ext3_free_blocks(handle, inode, newex.ee_start, newex.ee_len, 0);
229 @@ -2345,6 +2365,7 @@ int ext3_ext_get_block(handle_t *handle,
231 /* previous routine could use block we allocated */
232 newblock = newex.ee_start;
233 + allocated = newex.ee_len;
234 set_buffer_new(bh_result);
236 ext3_ext_put_in_cache(&tree, newex.ee_block, newex.ee_len,
237 @@ -2397,6 +2418,9 @@ void ext3_ext_truncate(struct inode * in
238 down(&EXT3_I(inode)->truncate_sem);
239 ext3_ext_invalidate_cache(&tree);
241 + /* it's important to discard preallocations under truncate_sem */
242 + ext3_mb_discard_inode_preallocations(inode);
245 * TODO: optimization is possible here
246 * probably we need not scaning at all,
247 Index: linux-2.6.9/fs/ext3/Makefile
248 ===================================================================
249 --- linux-2.6.9.orig/fs/ext3/Makefile
250 +++ linux-2.6.9/fs/ext3/Makefile
251 @@ -6,7 +6,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o
253 ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
254 ioctl.o namei.o super.o symlink.o hash.o resize.o \
256 + extents.o mballoc.o
258 ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
259 ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
260 Index: linux-2.6.9/fs/ext3/xattr.c
261 ===================================================================
262 --- linux-2.6.9.orig/fs/ext3/xattr.c
263 +++ linux-2.6.9/fs/ext3/xattr.c
264 @@ -1281,7 +1281,7 @@ ext3_xattr_set_handle2(handle_t *handle,
265 new_bh = sb_getblk(sb, block);
268 - ext3_free_blocks(handle, inode, block, 1);
269 + ext3_free_blocks(handle, inode, block, 1, 1);
273 @@ -1328,7 +1328,7 @@ getblk_failed:
275 mb_cache_entry_free(ce);
276 ea_bdebug(old_bh, "freeing");
277 - ext3_free_blocks(handle, inode, old_bh->b_blocknr, 1);
278 + ext3_free_blocks(handle, inode, old_bh->b_blocknr, 1, 1);
280 /* ext3_forget() calls bforget() for us, but we
281 let our caller release old_bh, so we need to
282 @@ -1427,7 +1427,7 @@ ext3_xattr_delete_inode(handle_t *handle
283 if (HDR(bh)->h_refcount == cpu_to_le32(1)) {
285 mb_cache_entry_free(ce);
286 - ext3_free_blocks(handle, inode, EXT3_I(inode)->i_file_acl, 1);
287 + ext3_free_blocks(handle, inode, EXT3_I(inode)->i_file_acl, 1, 1);
289 ext3_forget(handle, 1, inode, bh, EXT3_I(inode)->i_file_acl);
291 Index: linux-2.6.9/fs/ext3/balloc.c
292 ===================================================================
293 --- linux-2.6.9.orig/fs/ext3/balloc.c
294 +++ linux-2.6.9/fs/ext3/balloc.c
295 @@ -79,7 +79,7 @@ struct ext3_group_desc * ext3_get_group_
297 * Return buffer_head on success or NULL in case of failure.
299 -static struct buffer_head *
300 +struct buffer_head *
301 read_block_bitmap(struct super_block *sb, unsigned int block_group)
303 struct ext3_group_desc * desc;
304 @@ -267,6 +267,8 @@ void ext3_discard_reservation(struct ino
305 struct reserve_window_node *rsv = &ei->i_rsv_window;
306 spinlock_t *rsv_lock = &EXT3_SB(inode->i_sb)->s_rsv_window_lock;
308 + ext3_mb_discard_inode_preallocations(inode);
310 if (!rsv_is_empty(&rsv->rsv_window)) {
312 if (!rsv_is_empty(&rsv->rsv_window))
313 @@ -451,21 +453,25 @@ error_return:
317 -/* Free given blocks, update quota and i_blocks field */
318 -void ext3_free_blocks(handle_t *handle, struct inode *inode,
319 - unsigned long block, unsigned long count)
320 +void ext3_free_blocks(handle_t *handle, struct inode * inode,
321 + unsigned long block, unsigned long count, int metadata)
323 - struct super_block * sb;
324 - int dquot_freed_blocks;
325 + struct super_block *sb;
328 + /* this isn't the right place to decide whether block is metadata
329 + * inode.c/extents.c knows better, but for safety ... */
330 + if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode) ||
331 + ext3_should_journal_data(inode))
336 - printk ("ext3_free_blocks: nonexistent device");
339 - ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
340 - if (dquot_freed_blocks)
341 - DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
342 + if (!test_opt(sb, MBALLOC) || !EXT3_SB(sb)->s_group_info)
343 + ext3_free_blocks_sb(handle, sb, block, count, &freed);
345 + ext3_mb_free_blocks(handle, inode, block, count, metadata, &freed);
347 + DQUOT_FREE_BLOCK(inode, freed);
351 @@ -1131,7 +1137,7 @@ int ext3_should_retry_alloc(struct super
352 * bitmap, and then for any free bit if that fails.
353 * This function also updates quota and i_blocks field.
355 -int ext3_new_block(handle_t *handle, struct inode *inode,
356 +int ext3_new_block_old(handle_t *handle, struct inode *inode,
357 unsigned long goal, int *errp)
359 struct buffer_head *bitmap_bh = NULL;
360 Index: linux-2.6.9/fs/ext3/inode.c
361 ===================================================================
362 --- linux-2.6.9.orig/fs/ext3/inode.c
363 +++ linux-2.6.9/fs/ext3/inode.c
364 @@ -572,7 +572,7 @@ static int ext3_alloc_branch(handle_t *h
365 ext3_journal_forget(handle, branch[i].bh);
367 for (i = 0; i < keys; i++)
368 - ext3_free_blocks(handle, inode, le32_to_cpu(branch[i].key), 1);
369 + ext3_free_blocks(handle, inode, le32_to_cpu(branch[i].key), 1, 0);
373 @@ -673,7 +673,7 @@ err_out:
375 for (i = 0; i < num; i++)
376 ext3_free_blocks(handle, inode,
377 - le32_to_cpu(where[i].key), 1);
378 + le32_to_cpu(where[i].key), 1, 0);
382 @@ -1834,7 +1834,7 @@ ext3_clear_blocks(handle_t *handle, stru
386 - ext3_free_blocks(handle, inode, block_to_free, count);
387 + ext3_free_blocks(handle, inode, block_to_free, count, 0);
391 @@ -2007,7 +2007,7 @@ static void ext3_free_branches(handle_t
392 ext3_journal_test_restart(handle, inode);
395 - ext3_free_blocks(handle, inode, nr, 1);
396 + ext3_free_blocks(handle, inode, nr, 1, 1);