diff -u --recursive --new-file -X /linux/dontdiff a/fs/afs/kafstimod.c b/fs/afs/kafstimod.c
--- a/fs/afs/kafstimod.c Sat Feb 15 20:42:01 2003
+++ b/fs/afs/kafstimod.c Tue Mar 18 15:05:28 2003
@@ -99,18 +99,18 @@
spin_lock(&kafstimod_lock);
if (list_empty(&kafstimod_list)) {
timeout = MAX_SCHEDULE_TIMEOUT;
- }
- else {
- timer = list_entry(kafstimod_list.next,afs_timer_t,link);
- timeout = timer->timo_jif;
+ } else {
+ unsigned long tmo;
+
+ timer = list_entry(kafstimod_list.next,
+ afs_timer_t, link);
+ tmo = timer->timo_jif;
jif = jiffies;
- if (time_before_eq(timeout,jif))
+ if (time_before_eq(tmo,jif))
goto immediate;
- else {
- timeout = (long)timeout - (long)jiffies;
- }
+ timeout = (long)tmo - (long)jiffies;
}
spin_unlock(&kafstimod_lock);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Apr 15 2003 - 22:00:14 EST