summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-25 03:06:53 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 08:22:50 -0800
commite3df18983ea090a2e00dd5c2c6167bb431a0e0a2 (patch)
tree99f7944da7c8c85eed6738c1ef9f357f7dcae928 /include/linux
parent1d9b7d97d6661edb44ce08f17e47c66d4ac20e34 (diff)
downloadop-kernel-dev-e3df18983ea090a2e00dd5c2c6167bb431a0e0a2.zip
op-kernel-dev-e3df18983ea090a2e00dd5c2c6167bb431a0e0a2.tar.gz
[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 'include/linux')
-rw-r--r--include/linux/jbd.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 2ccbfb63..4fc7dff 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -29,6 +29,8 @@
#include <linux/stddef.h>
#include <linux/bit_spinlock.h>
#include <linux/mutex.h>
+#include <linux/timer.h>
+
#include <asm/semaphore.h>
#endif
@@ -787,7 +789,7 @@ struct journal_s
unsigned long j_commit_interval;
/* The timer used to wakeup the commit thread: */
- struct timer_list *j_commit_timer;
+ struct timer_list j_commit_timer;
/*
* The revoke table: maintains the list of revoked blocks in the
OpenPOWER on IntegriCloud