svn commit: samba r14209 - in branches/SAMBA_4_0/source/ntvfs/cifs: .

tridge at samba.org tridge at samba.org
Sat Mar 11 13:06:18 GMT 2006


Author: tridge
Date: 2006-03-11 13:06:17 +0000 (Sat, 11 Mar 2006)
New Revision: 14209

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

Log:

don't timeout notify requests in the cifs backend, as they are
intended to wait forever


Modified:
   branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2006-03-11 12:58:36 UTC (rev 14208)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2006-03-11 13:06:17 UTC (rev 14209)
@@ -890,6 +890,7 @@
 {
 	struct cvfs_private *private = ntvfs->private_data;
 	struct smbcli_request *c_req;
+	int saved_timeout = private->transport->options.request_timeout;
 
 	SETUP_PID;
 
@@ -897,9 +898,15 @@
 	if (!(req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC)) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
-	
+
+	/* we must not timeout on notify requests - they wait
+	   forever */
+	private->transport->options.request_timeout = 0;
+
 	c_req = smb_raw_changenotify_send(private->tree, info);
 
+	private->transport->options.request_timeout = saved_timeout;
+
 	ASYNC_RECV_TAIL(info, async_changenotify);
 }
 



More information about the samba-cvs mailing list