diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-25 03:06:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:22:50 -0800 |
| commit | e3df18983ea090a2e00dd5c2c6167bb431a0e0a2 (patch) | |
| tree | 99f7944da7c8c85eed6738c1ef9f357f7dcae928 /fs/jbd/transaction.c | |
| parent | 1d9b7d97d6661edb44ce08f17e47c66d4ac20e34 (diff) | |
| download | linux-stable-e3df18983ea090a2e00dd5c2c6167bb431a0e0a2.tar.gz linux-stable-e3df18983ea090a2e00dd5c2c6167bb431a0e0a2.tar.bz2 linux-stable-e3df18983ea090a2e00dd5c2c6167bb431a0e0a2.zip | |
[PATCH] jbd: embed j_commit_timer in journal struct
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>
Diffstat (limited to 'fs/jbd/transaction.c')
| -rw-r--r-- | fs/jbd/transaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 5fc40888f4cf..ada31fa272e3 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -53,8 +53,8 @@ get_transaction(journal_t *journal, transaction_t *transaction) spin_lock_init(&transaction->t_handle_lock); /* Set up the commit timer for the new transaction. */ - journal->j_commit_timer->expires = transaction->t_expires; - add_timer(journal->j_commit_timer); + journal->j_commit_timer.expires = transaction->t_expires; + add_timer(&journal->j_commit_timer); J_ASSERT(journal->j_running_transaction == NULL); journal->j_running_transaction = transaction; |