projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debugobjects: add timer specific object debugging code
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
fs
/
aio.c
diff --git
a/fs/aio.c
b/fs/aio.c
index 99c2352906a021cf42e6673faf71a9519bea05d4..b5253e77eb2f137ee5b1346f848514ad991801e1 100644
(file)
--- 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)
{
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;
}
to->timed_out = 0;
to->p = current;
}
@@
-1213,6
+1211,7
@@
retry:
if (timeout)
clear_timeout(&to);
out:
if (timeout)
clear_timeout(&to);
out:
+ destroy_timer_on_stack(&to.timer);
return i ? i : ret;
}
return i ? i : ret;
}