aboutsummaryrefslogtreecommitdiffstats
path: root/fs/aio.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-04-30 03:55:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:53 -0400
commitc6f3a97f86a5c97be0ca255976110bb9c3cfe669 (patch)
tree95a7bf3c928a85b26aed128786fc09e18bc5dcfc /fs/aio.c
parent691cc54c7d28542434d2b3ee4ddbad6a99312dec (diff)
debugobjects: add timer specific object debugging code
Add calls to the generic object debugging infrastructure and provide fixup functions which allow to keep the system alive when recoverable problems have been detected by the object debugging core code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@elte.hu> Cc: Greg KH <greg@kroah.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/aio.c')
-rw-r--r--fs/aio.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 99c2352906a0..b5253e77eb2f 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1078,9 +1078,7 @@ static void timeout_func(unsigned long data)
1078 1078
1079static inline void init_timeout(struct aio_timeout *to) 1079static inline void init_timeout(struct aio_timeout *to)
1080{ 1080{
1081 init_timer(&to->timer); 1081 setup_timer_on_stack(&to->timer, timeout_func, (unsigned long) to);
1082 to->timer.data = (unsigned long)to;
1083 to->timer.function = timeout_func;
1084 to->timed_out = 0; 1082 to->timed_out = 0;
1085 to->p = current; 1083 to->p = current;
1086} 1084}
@@ -1213,6 +1211,7 @@ retry:
1213 if (timeout) 1211 if (timeout)
1214 clear_timeout(&to); 1212 clear_timeout(&to);
1215out: 1213out:
1214 destroy_timer_on_stack(&to.timer);
1216 return i ? i : ret; 1215 return i ? i : ret;
1217} 1216}
1218 1217