svn commit: samba r3035 - in branches/SAMBA_4_0/source/ntvfs/posix: .

[tridge at samba.org]

Author: tridge
Date: 2004-10-18 12:06:21 +0000 (Mon, 18 Oct 2004)
New Revision: 3035

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/ntvfs/posix&rev=3035&nolog=1

Log:
if the ntvfs layers prior to us have said that we can't perform an
operation asynchronously (such as the nbench module), then ignore lock
timeouts, as they would make no sense



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


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c	2004-10-18 11:47:13 UTC (rev 3034)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c	2004-10-18 12:06:21 UTC (rev 3035)
@@ -295,7 +295,8 @@
 	}
 
 	/* now the lockingX case, most common and also most complex */
-	if (lck->lockx.in.timeout != 0) {
+	if (lck->lockx.in.timeout != 0 && 
+	    req->async.send_fn) {
 		pending = talloc_p(req, struct pvfs_pending_lock);
 		if (pending == NULL) {
 			return NT_STATUS_NO_MEMORY;