2 fs/ext3/inode.c | 116 ++++++++++++++++++++++
3 fs/ext3/super.c | 230 +++++++++++++++++++++++++++++++++++++++++++++
4 include/linux/ext3_fs.h | 5
5 include/linux/ext3_fs_sb.h | 10 +
6 5 files changed, 365 insertions(+)
8 Index: linux-2.4.21-suse/fs/ext3/super.c
9 ===================================================================
10 --- linux-2.4.21-suse.orig/fs/ext3/super.c 2004-01-12 19:49:25.000000000 +0300
11 +++ linux-2.4.21-suse/fs/ext3/super.c 2004-01-13 17:39:59.000000000 +0300
16 +#ifdef EXT3_DELETE_THREAD
18 + * Delete inodes in a loop until there are no more to be deleted.
19 + * Normally, we run in the background doing the deletes and sleeping again,
20 + * and clients just add new inodes to be deleted onto the end of the list.
21 + * If someone is concerned about free space (e.g. block allocation or similar)
22 + * then they can sleep on s_delete_waiter_queue and be woken up when space
25 +int ext3_delete_thread(void *data)
27 + struct super_block *sb = data;
28 + struct ext3_sb_info *sbi = EXT3_SB(sb);
29 + struct task_struct *tsk = current;
31 + /* Almost like daemonize, but not quite */
36 + exit_files(current);
39 + sprintf(tsk->comm, "kdelext3-%s", kdevname(sb->s_dev));
40 + sigfillset(&tsk->blocked);
42 + /*tsk->flags |= PF_KERNTHREAD;*/
44 + INIT_LIST_HEAD(&sbi->s_delete_list);
45 + wake_up(&sbi->s_delete_waiter_queue);
46 + ext3_debug("delete thread on %s started\n", kdevname(sb->s_dev));
50 + wait_event_interruptible(sbi->s_delete_thread_queue,
51 + !list_empty(&sbi->s_delete_list) ||
52 + !test_opt(sb, ASYNCDEL));
53 + ext3_debug("%s woken up: %lu inodes, %lu blocks\n",
54 + tsk->comm,sbi->s_delete_inodes,sbi->s_delete_blocks);
56 + spin_lock(&sbi->s_delete_lock);
57 + if (list_empty(&sbi->s_delete_list)) {
58 + clear_opt(sbi->s_mount_opt, ASYNCDEL);
59 + memset(&sbi->s_delete_list, 0,
60 + sizeof(sbi->s_delete_list));
61 + spin_unlock(&sbi->s_delete_lock);
62 + ext3_debug("delete thread on %s exiting\n",
63 + kdevname(sb->s_dev));
64 + wake_up(&sbi->s_delete_waiter_queue);
68 + while (!list_empty(&sbi->s_delete_list)) {
69 + struct inode *inode=list_entry(sbi->s_delete_list.next,
70 + struct inode, i_dentry);
71 + unsigned long blocks = inode->i_blocks >>
72 + (inode->i_blkbits - 9);
74 + list_del_init(&inode->i_dentry);
75 + spin_unlock(&sbi->s_delete_lock);
76 + ext3_debug("%s delete ino %lu blk %lu\n",
77 + tsk->comm, inode->i_ino, blocks);
81 + spin_lock(&sbi->s_delete_lock);
82 + sbi->s_delete_blocks -= blocks;
83 + sbi->s_delete_inodes--;
85 + if (sbi->s_delete_blocks != 0 || sbi->s_delete_inodes != 0) {
86 + ext3_warning(sb, __FUNCTION__,
87 + "%lu blocks, %lu inodes on list?\n",
88 + sbi->s_delete_blocks,sbi->s_delete_inodes);
89 + sbi->s_delete_blocks = 0;
90 + sbi->s_delete_inodes = 0;
92 + spin_unlock(&sbi->s_delete_lock);
93 + wake_up(&sbi->s_delete_waiter_queue);
99 +static void ext3_start_delete_thread(struct super_block *sb)
101 + struct ext3_sb_info *sbi = EXT3_SB(sb);
104 + spin_lock_init(&sbi->s_delete_lock);
105 + init_waitqueue_head(&sbi->s_delete_thread_queue);
106 + init_waitqueue_head(&sbi->s_delete_waiter_queue);
108 + if (!test_opt(sb, ASYNCDEL))
111 + rc = kernel_thread(ext3_delete_thread, sb, CLONE_VM | CLONE_FILES);
113 + printk(KERN_ERR "EXT3-fs: cannot start delete thread: rc %d\n",
116 + wait_event(sbi->s_delete_waiter_queue, sbi->s_delete_list.next);
119 +static void ext3_stop_delete_thread(struct ext3_sb_info *sbi)
121 + if (sbi->s_delete_list.next == 0) /* thread never started */
124 + clear_opt(sbi->s_mount_opt, ASYNCDEL);
125 + wake_up(&sbi->s_delete_thread_queue);
126 + wait_event(sbi->s_delete_waiter_queue,
127 + sbi->s_delete_list.next == 0 && sbi->s_delete_inodes == 0);
130 +/* Instead of playing games with the inode flags, destruction, etc we just
131 + * create a new inode locally and put it on a list for the truncate thread.
132 + * We need large parts of the inode struct in order to complete the
133 + * truncate and unlink, so we may as well just have a real inode to do it.
135 + * If we have any problem deferring the delete, just delete it right away.
136 + * If we defer it, we also mark how many blocks it would free, so that we
137 + * can keep the statfs data correct, and we know if we should sleep on the
138 + * delete thread when we run out of space.
140 +static void ext3_delete_inode_thread(struct inode *old_inode)
142 + struct ext3_sb_info *sbi = EXT3_SB(old_inode->i_sb);
143 + struct ext3_inode_info *nei, *oei = EXT3_I(old_inode);
144 + struct inode *new_inode;
145 + unsigned long blocks = old_inode->i_blocks >> (old_inode->i_blkbits-9);
147 + if (is_bad_inode(old_inode)) {
148 + clear_inode(old_inode);
152 + if (!test_opt(old_inode->i_sb, ASYNCDEL) || !sbi->s_delete_list.next)
155 + /* We may want to delete the inode immediately and not defer it */
156 + if (IS_SYNC(old_inode) || blocks <= EXT3_NDIR_BLOCKS)
159 + /* We can't use the delete thread as-is during real orphan recovery,
160 + * as we add to the orphan list here, causing ext3_orphan_cleanup()
161 + * to loop endlessly. It would be nice to do so, but needs work.
163 + if (oei->i_state & EXT3_STATE_DELETE ||
164 + sbi->s_mount_state & EXT3_ORPHAN_FS) {
165 + ext3_debug("doing deferred inode %lu delete (%lu blocks)\n",
166 + old_inode->i_ino, blocks);
170 + /* We can iget this inode again here, because our caller has unhashed
171 + * old_inode, so new_inode will be in a different inode struct.
173 + * We need to ensure that the i_orphan pointers in the other inodes
174 + * point at the new inode copy instead of the old one so the orphan
175 + * list doesn't get corrupted when the old orphan inode is freed.
177 + down(&sbi->s_orphan_lock);
179 + sbi->s_mount_state |= EXT3_ORPHAN_FS;
180 + new_inode = iget(old_inode->i_sb, old_inode->i_ino);
181 + sbi->s_mount_state &= ~EXT3_ORPHAN_FS;
182 + if (is_bad_inode(new_inode)) {
183 + printk(KERN_WARNING "read bad inode %lu\n", old_inode->i_ino);
188 + up(&sbi->s_orphan_lock);
189 + ext3_debug("delete inode %lu directly (bad read)\n",
193 + J_ASSERT(new_inode != old_inode);
195 + J_ASSERT(!list_empty(&oei->i_orphan));
197 + nei = EXT3_I(new_inode);
198 + /* Ugh. We need to insert new_inode into the same spot on the list
199 + * as old_inode was, to ensure the in-memory orphan list is still
200 + * in the same order as the on-disk orphan list (badness otherwise).
202 + nei->i_orphan = oei->i_orphan;
203 + nei->i_orphan.next->prev = &nei->i_orphan;
204 + nei->i_orphan.prev->next = &nei->i_orphan;
205 + nei->i_state |= EXT3_STATE_DELETE;
206 + up(&sbi->s_orphan_lock);
208 + clear_inode(old_inode);
210 + spin_lock(&sbi->s_delete_lock);
211 + J_ASSERT(list_empty(&new_inode->i_dentry));
212 + list_add_tail(&new_inode->i_dentry, &sbi->s_delete_list);
213 + sbi->s_delete_blocks += blocks;
214 + sbi->s_delete_inodes++;
215 + spin_unlock(&sbi->s_delete_lock);
217 + ext3_debug("delete inode %lu (%lu blocks) by thread\n",
218 + new_inode->i_ino, blocks);
220 + wake_up(&sbi->s_delete_thread_queue);
224 + ext3_delete_inode(old_inode);
227 +#define ext3_start_delete_thread(sbi) do {} while(0)
228 +#define ext3_stop_delete_thread(sbi) do {} while(0)
229 +#endif /* EXT3_DELETE_THREAD */
231 void ext3_put_super (struct super_block * sb)
233 struct ext3_sb_info *sbi = EXT3_SB(sb);
235 kdev_t j_dev = sbi->s_journal->j_dev;
238 + J_ASSERT(sbi->s_delete_inodes == 0);
239 ext3_xattr_put_super(sb);
240 journal_destroy(sbi->s_journal);
241 if (!(sb->s_flags & MS_RDONLY)) {
243 write_inode: ext3_write_inode, /* BKL not held. Don't need */
244 dirty_inode: ext3_dirty_inode, /* BKL not held. We take it */
245 put_inode: ext3_put_inode, /* BKL not held. Don't need */
246 +#ifdef EXT3_DELETE_THREAD
247 + delete_inode: ext3_delete_inode_thread,/* BKL not held. We take it */
249 delete_inode: ext3_delete_inode, /* BKL not held. We take it */
251 put_super: ext3_put_super, /* BKL held */
252 write_super: ext3_write_super, /* BKL held */
253 sync_fs: ext3_sync_fs,
255 clear_opt (*mount_options, XATTR_USER);
258 +#ifdef EXT3_DELETE_THREAD
259 + if (!strcmp(this_char, "asyncdel"))
260 + set_opt(*mount_options, ASYNCDEL);
261 + else if (!strcmp(this_char, "noasyncdel"))
262 + clear_opt(*mount_options, ASYNCDEL);
265 if (!strcmp (this_char, "bsddf"))
266 clear_opt (*mount_options, MINIX_DF);
267 else if (!strcmp (this_char, "nouid32")) {
268 @@ -1223,6 +1450,7 @@
271 ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY);
272 + ext3_start_delete_thread(sb);
274 * akpm: core read_super() calls in here with the superblock locked.
275 * That deadlocks, because orphan cleanup needs to lock the superblock
276 @@ -1614,7 +1842,12 @@
277 static int ext3_sync_fs(struct super_block *sb)
282 + if (atomic_read(&sb->s_active) == 0) {
283 + /* fs is being umounted: time to stop delete thread */
284 + ext3_stop_delete_thread(EXT3_SB(sb));
288 target = log_start_commit(EXT3_SB(sb)->s_journal, NULL);
289 log_wait_commit(EXT3_SB(sb)->s_journal, target);
290 @@ -1678,6 +1911,9 @@
291 if (!parse_options(data, &tmp, sbi, &tmp, 1))
294 + if (!test_opt(sb, ASYNCDEL) || (*flags & MS_RDONLY))
295 + ext3_stop_delete_thread(sbi);
297 if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
298 ext3_abort(sb, __FUNCTION__, "Abort forced by user");
300 Index: linux-2.4.21-suse/fs/ext3/inode.c
301 ===================================================================
302 --- linux-2.4.21-suse.orig/fs/ext3/inode.c 2004-01-13 17:38:09.000000000 +0300
303 +++ linux-2.4.21-suse/fs/ext3/inode.c 2004-01-13 17:38:10.000000000 +0300
304 @@ -2552,6 +2552,118 @@
308 +#ifdef EXT3_DELETE_THREAD
309 +/* Move blocks from to-be-truncated inode over to a new inode, and delete
310 + * that one from the delete thread instead. This avoids a lot of latency
311 + * when truncating large files.
313 + * If we have any problem deferring the truncate, just truncate it right away.
314 + * If we defer it, we also mark how many blocks it would free, so that we
315 + * can keep the statfs data correct, and we know if we should sleep on the
316 + * delete thread when we run out of space.
318 +void ext3_truncate_thread(struct inode *old_inode)
320 + struct ext3_sb_info *sbi = EXT3_SB(old_inode->i_sb);
321 + struct ext3_inode_info *nei, *oei = EXT3_I(old_inode);
322 + struct inode *new_inode;
324 + unsigned long blocks = old_inode->i_blocks >> (old_inode->i_blkbits-9);
326 + if (!test_opt(old_inode->i_sb, ASYNCDEL) || !sbi->s_delete_list.next)
329 + /* XXX This is a temporary limitation for code simplicity.
330 + * We could truncate to arbitrary sizes at some later time.
332 + if (old_inode->i_size != 0)
335 + /* We may want to truncate the inode immediately and not defer it */
336 + if (IS_SYNC(old_inode) || blocks <= EXT3_NDIR_BLOCKS ||
337 + old_inode->i_size > oei->i_disksize)
340 + /* We can't use the delete thread as-is during real orphan recovery,
341 + * as we add to the orphan list here, causing ext3_orphan_cleanup()
342 + * to loop endlessly. It would be nice to do so, but needs work.
344 + if (oei->i_state & EXT3_STATE_DELETE ||
345 + sbi->s_mount_state & EXT3_ORPHAN_FS) {
346 + ext3_debug("doing deferred inode %lu delete (%lu blocks)\n",
347 + old_inode->i_ino, blocks);
351 + ext3_discard_prealloc(old_inode);
354 + * new_inode = sb + GDT + ibitmap
355 + * orphan list = 1 inode/superblock for add, 2 inodes for del
356 + * quota files = 2 * EXT3_SINGLEDATA_TRANS_BLOCKS
358 + handle = ext3_journal_start(old_inode, 7);
359 + if (IS_ERR(handle))
362 + new_inode = ext3_new_inode(handle, old_inode, old_inode->i_mode);
363 + if (IS_ERR(new_inode)) {
364 + ext3_debug("truncate inode %lu directly (no new inodes)\n",
369 + nei = EXT3_I(new_inode);
371 + down_write(&oei->truncate_sem);
372 + new_inode->i_size = old_inode->i_size;
373 + new_inode->i_blocks = old_inode->i_blocks;
374 + new_inode->i_uid = old_inode->i_uid;
375 + new_inode->i_gid = old_inode->i_gid;
376 + new_inode->i_nlink = 0;
378 + /* FIXME when we do arbitrary truncates */
379 + old_inode->i_blocks = oei->i_file_acl ? old_inode->i_blksize / 512 : 0;
380 + old_inode->i_mtime = old_inode->i_ctime = CURRENT_TIME;
382 + memcpy(nei->i_data, oei->i_data, sizeof(nei->i_data));
383 + memset(oei->i_data, 0, sizeof(oei->i_data));
385 + nei->i_disksize = oei->i_disksize;
386 + nei->i_state |= EXT3_STATE_DELETE;
387 + up_write(&oei->truncate_sem);
389 + if (ext3_orphan_add(handle, new_inode) < 0)
392 + if (ext3_orphan_del(handle, old_inode) < 0) {
393 + ext3_orphan_del(handle, new_inode);
398 + ext3_journal_stop(handle, old_inode);
400 + spin_lock(&sbi->s_delete_lock);
401 + J_ASSERT(list_empty(&new_inode->i_dentry));
402 + list_add_tail(&new_inode->i_dentry, &sbi->s_delete_list);
403 + sbi->s_delete_blocks += blocks;
404 + sbi->s_delete_inodes++;
405 + spin_unlock(&sbi->s_delete_lock);
407 + ext3_debug("delete inode %lu (%lu blocks) by thread\n",
408 + new_inode->i_ino, blocks);
410 + wake_up(&sbi->s_delete_thread_queue);
414 + ext3_journal_stop(handle, old_inode);
416 + ext3_truncate(old_inode);
418 +#endif /* EXT3_DELETE_THREAD */
421 * On success, We end up with an outstanding reference count against
422 * iloc->bh. This _must_ be cleaned up later.
423 Index: linux-2.4.21-suse/fs/ext3/file.c
424 ===================================================================
425 --- linux-2.4.21-suse.orig/fs/ext3/file.c 2004-01-12 19:49:25.000000000 +0300
426 +++ linux-2.4.21-suse/fs/ext3/file.c 2004-01-13 17:38:10.000000000 +0300
430 struct inode_operations ext3_file_inode_operations = {
431 +#ifdef EXT3_DELETE_THREAD
432 + truncate: ext3_truncate_thread, /* BKL held */
434 truncate: ext3_truncate, /* BKL held */
436 setattr: ext3_setattr, /* BKL held */
437 setxattr: ext3_setxattr, /* BKL held */
438 getxattr: ext3_getxattr, /* BKL held */
439 Index: linux-2.4.21-suse/include/linux/ext3_fs.h
440 ===================================================================
441 --- linux-2.4.21-suse.orig/include/linux/ext3_fs.h 2004-01-13 17:38:09.000000000 +0300
442 +++ linux-2.4.21-suse/include/linux/ext3_fs.h 2004-01-13 17:38:10.000000000 +0300
445 #define EXT3_STATE_JDATA 0x00000001 /* journaled data exists */
446 #define EXT3_STATE_NEW 0x00000002 /* inode is newly created */
447 +#define EXT3_STATE_DELETE 0x00000010 /* deferred delete inode */
452 #define EXT3_MOUNT_UPDATE_JOURNAL 0x1000 /* Update the journal format */
453 #define EXT3_MOUNT_NO_UID32 0x2000 /* Disable 32-bit UIDs */
454 #define EXT3_MOUNT_XATTR_USER 0x4000 /* Extended user attributes */
455 +#define EXT3_MOUNT_ASYNCDEL 0x20000 /* Delayed deletion */
457 /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
458 #ifndef _LINUX_EXT2_FS_H
460 extern void ext3_dirty_inode(struct inode *);
461 extern int ext3_change_inode_journal_flag(struct inode *, int);
462 extern void ext3_truncate (struct inode *);
463 +#ifdef EXT3_DELETE_THREAD
464 +extern void ext3_truncate_thread(struct inode *inode);
466 extern void ext3_set_inode_flags(struct inode *);
469 Index: linux-2.4.21-suse/include/linux/ext3_fs_sb.h
470 ===================================================================
471 --- linux-2.4.21-suse.orig/include/linux/ext3_fs_sb.h 2004-01-12 19:49:25.000000000 +0300
472 +++ linux-2.4.21-suse/include/linux/ext3_fs_sb.h 2004-01-13 17:38:10.000000000 +0300
475 #define EXT3_MAX_GROUP_LOADED 8
477 +#define EXT3_DELETE_THREAD
480 * third extended-fs super-block data in memory
483 struct timer_list turn_ro_timer; /* For turning read-only (crash simulation) */
484 wait_queue_head_t ro_wait_queue; /* For people waiting for the fs to go read-only */
486 +#ifdef EXT3_DELETE_THREAD
487 + spinlock_t s_delete_lock;
488 + struct list_head s_delete_list;
489 + unsigned long s_delete_blocks;
490 + unsigned long s_delete_inodes;
491 + wait_queue_head_t s_delete_thread_queue;
492 + wait_queue_head_t s_delete_waiter_queue;
496 #endif /* _LINUX_EXT3_FS_SB */