summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-05-14 20:33:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:06:03 -0500
commit452ef0b40dc01a1a31c92b54ae771e06bb2d0de1 (patch)
tree6f3fcf2fb597e6fd02ac85466517b34622365f78
parent0b069ab07e24d45bff27274720ebbf3e37de52a1 (diff)
downloadsamba-452ef0b40dc01a1a31c92b54ae771e06bb2d0de1.tar.gz
samba-452ef0b40dc01a1a31c92b54ae771e06bb2d0de1.tar.bz2
samba-452ef0b40dc01a1a31c92b54ae771e06bb2d0de1.zip
r15603: True isn't a valid parameter here, PVFS_WAIT_TIMEOUT is...
(both are '1') metze (This used to be commit de9d04abcceae7b1e21f521d0bb2fa5129c237b2)
-rw-r--r--source4/ntvfs/posix/pvfs_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 4dbb13cb42..0558fd52ea 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -258,7 +258,7 @@ static NTSTATUS pvfs_lock_cancel(struct pvfs_state *pvfs, struct ntvfs_request *
/* an exact match! we can cancel it, which is equivalent
to triggering the timeout early */
- pvfs_pending_lock_continue(p ,True);
+ pvfs_pending_lock_continue(p, PVFS_WAIT_TIMEOUT);
return NT_STATUS_OK;
}
}