r15603: True isn't a valid parameter here, PVFS_WAIT_TIMEOUT is...

(both are '1')

metze
(This used to be commit de9d04abcceae7b1e21f521d0bb2fa5129c237b2)

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 4dbb13cb429c0b378462cc95ca8783c8b2b22675..0558fd52ea43467e97550207f324462495004dc2 100644 (file)
--- 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;
                }
        }