TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] jbd: embed j_commit_timer in journal struct

Browse Source 
The kjournald timer is currently on the kernel thread's stack and the journal
structure points at it.  Save a pointer hop by moving the timer into the
journal structure.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton
2006-03-25 03:06:53 -08:00
committed by Linus Torvalds
parent 1d9b7d97d6
commit e3df18983e
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/jbd/journal.c
+9 -10
View File
@@ -111,18 +111,17 @@ static void commit_timeout(unsigned long __data)
static int kjournald(void *arg)
{
journal_t *journal = (journal_t *) arg;
journal_t *journal = arg;
transaction_t *transaction;
struct timer_list timer;
daemonize("kjournald");
/* Set up an interval timer which can be used to trigger a
commit wakeup after the commit interval expires */
init_timer(&timer);
timer.data = (unsigned long) current;
timer.function = commit_timeout;
journal->j_commit_timer = &timer;
/*
* Set up an interval timer which can be used to trigger a commit wakeup
* after the commit interval expires
*/
setup_timer(&journal->j_commit_timer, commit_timeout,
(unsigned long)current);
/* Record that the journal thread is running */
journal->j_task = current;
@@ -146,7 +145,7 @@ loop:
if (journal->j_commit_sequence != journal->j_commit_request) {
jbd_debug(1, "OK, requests differ\n");
spin_unlock(&journal->j_state_lock);
del_timer_sync(journal->j_commit_timer);
del_timer_sync(&journal->j_commit_timer);
journal_commit_transaction(journal);
spin_lock(&journal->j_state_lock);
goto loop;
@@ -203,7 +202,7 @@ loop:
end_loop:
spin_unlock(&journal->j_state_lock);
del_timer_sync(journal->j_commit_timer);
del_timer_sync(&journal->j_commit_timer);
journal->j_task = NULL;
wake_up(&journal->j_wait_done_commit);
jbd_debug(1, "Journal thread exiting.\n");