Author: tridge
Date: 2006-03-21 11:39:48 +0000 (Tue, 21 Mar 2006)
New Revision: 14614

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14614

Log:

handle zero timers in pvfs_wait()



Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_wait.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_wait.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_wait.c   2006-03-21 11:38:57 UTC 
(rev 14613)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_wait.c   2006-03-21 11:39:48 UTC 
(rev 14614)
@@ -33,7 +33,6 @@
        struct pvfs_state *pvfs;
        void (*handler)(void *, enum pvfs_wait_notice);
        void *private;
-       struct timed_event *te;
        int msg_type;
        struct messaging_context *msg_ctx;
        struct event_context *ev;
@@ -140,9 +139,10 @@
        pwait->req = talloc_reference(pwait, req);
        pwait->pvfs = pvfs;
 
-       /* setup a timer */
-       pwait->te = event_add_timed(pwait->ev, pwait, end_time, 
-                                   pvfs_wait_timeout, pwait);
+       if (!timeval_is_zero(&end_time)) {
+               /* setup a timer */
+               event_add_timed(pwait->ev, pwait, end_time, pvfs_wait_timeout, 
pwait);
+       }
 
        /* register with the messaging subsystem for this message
           type */

Reply via email to