diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-18 12:06:21 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:00:00 -0500 |
| commit | 8e8c6aef3c99931cdfe8d0bf8ca74616e0960014 (patch) | |
| tree | cac3c1111f3fe1914c4968c2892021909c9c9e0d /source4/ntvfs | |
| parent | 384f87bd38c1133c90e2a57775f139532574e3cc (diff) | |
| download | samba-8e8c6aef3c99931cdfe8d0bf8ca74616e0960014.tar.gz samba-8e8c6aef3c99931cdfe8d0bf8ca74616e0960014.tar.bz2 samba-8e8c6aef3c99931cdfe8d0bf8ca74616e0960014.zip | |
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
(This used to be commit 2894dd0ac0ddd0ae5b4d536d5cff0690bbfab1a0)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c index ead1371ebc..e32fcb2e3a 100644 --- a/source4/ntvfs/posix/pvfs_lock.c +++ b/source4/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; |