From 745e39d751a24634bf1d4f3d5d379b796cecce37 Mon Sep 17 00:00:00 2001 From: green Date: Sun, 11 Dec 2005 22:13:17 +0000 Subject: [PATCH] b=9907 Fix __l_wait_event to correctly honor timeout value (broken by bug 9297 changes). --- lustre/include/linux/lustre_lib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/include/linux/lustre_lib.h b/lustre/include/linux/lustre_lib.h index 3282ac8..ef90acb 100644 --- a/lustre/include/linux/lustre_lib.h +++ b/lustre/include/linux/lustre_lib.h @@ -608,15 +608,15 @@ do { \ if (condition) \ break; \ \ - if (__timeout) { \ + if (__timeout == 0) { \ schedule(); \ } else { \ unsigned long interval = info->lwi_interval? \ min_t(unsigned long, \ info->lwi_interval,__timeout):\ __timeout; \ - __timeout -= interval + schedule_timeout(interval); \ - if (__timeout) { \ + __timeout -= interval - schedule_timeout(interval); \ + if (__timeout == 0) { \ if (info->lwi_on_timeout == NULL || \ info->lwi_on_timeout(info->lwi_cb_data)) { \ ret = -ETIMEDOUT; \ -- 1.8.3.1