sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

r3035: if the ntvfs layers prior to us have said that we can't perform an

Browse Source 
operation asynchronously (such as the nbench module), then ignore lock
timeouts, as they would make no sense
(This used to be commit 2894dd0ac0)
This commit is contained in:
Andrew Tridgell 2004-10-18 12:06:21 +00:00 committed by Gerald (Jerry) Carter
parent 384f87bd38
commit 8e8c6aef3c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/ntvfs/posix/pvfs_lock.c
View File

@ -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;