r3035: 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

diff --git a/source/ntvfs/posix/pvfs_lock.c b/source/ntvfs/posix/pvfs_lock.c
index ead1371ebc1e58b5e29521ef51f840d1381b3cac..e32fcb2e3a44e2b1ef64456081766b4c527aca9f 100644 (file)
--- a/source/ntvfs/posix/pvfs_lock.c
+++ b/source/ntvfs/posix/pvfs_lock.c
@@ -295,7 +295,8 @@ NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
        }
 
        /* 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;