X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=fs%2Faio.c;h=b5253e77eb2f137ee5b1346f848514ad991801e1;hb=1df5a8d004f64b1aa3fb93e0556886ba00ebc979;hp=99c2352906a021cf42e6673faf71a9519bea05d4;hpb=9781db7b345b5dfe93787aaaf310c861db7c1ede;p=linux-2.6

diff --git a/fs/aio.c b/fs/aio.c
index 99c2352906..b5253e77eb 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1078,9 +1078,7 @@ static void timeout_func(unsigned long data)
 
 static inline void init_timeout(struct aio_timeout *to)
 {
-	init_timer(&to->timer);
-	to->timer.data = (unsigned long)to;
-	to->timer.function = timeout_func;
+	setup_timer_on_stack(&to->timer, timeout_func, (unsigned long) to);
 	to->timed_out = 0;
 	to->p = current;
 }
@@ -1213,6 +1211,7 @@ retry:
 	if (timeout)
 		clear_timeout(&to);
 out:
+	destroy_timer_on_stack(&to.timer);
 	return i ? i : ret;
 }