Move process_blocking_lock_queue out of timeout_processing?

Jeremy Allison jra at samba.org
Sun Mar 18 20:36:00 GMT 2007


On Sun, Mar 18, 2007 at 01:14:42PM -0700, Jeremy Allison wrote:
> 
> Looking in the code it seems this might have been
> lost in some old, old, old rewrite :-).
> 
> I think this code in smbd/blocking.c :
> 
> 614                 if (timeval_is_zero(&blr->expire_time)) {
> 615                         continue; /* Never timeout. */
> 616                 }
> 617 
> 618                 tv_dif_us = usec_time_diff(&blr->expire_time, &tv_curr);
> 
> Might have needed to be :
> 
> 	...
> 	struct timeval tv_ex_time;
> 	....
> 
> 	tmp_ex_time.tv_sec = blr->expire_time;
> 	if (timeval_is_zero(&tmp_ex_time)) {
> 		/* Set a tmp variable expire time to now + 10 secs */
> 		tmp_exp_time.tv_sec = tv_curr.tv_sec + 30;
> 		tmp_ext_time.tv_usec = tv_curr.tv_usec;
> 	}
> 
> 	tv_dif_us = usec_time_diff(&tmp_ex_time, &tv_curr);
> 
> Any chance of adding that into the patch ?

Please ignore this, it isn't the right solution :-(.

I'll look at this more tomorrow when I'm at work.

Cheers,

	Jeremy.


More information about the samba-technical mailing list