From e1da1fcf12164f50f3462c90f0bb785d18c59b0b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 17 Jul 2006 21:09:02 +0000 Subject: r17098: Samba3 now cleanly passes Samba4 RAW-LOCK torture test. Phew - that was painful :-). But what it means is that we now implement lock cancels and I can add lock cancels into POSIX lock handling which will fix the fast/slow system call issue with cifsfs ! Jeremy. (This used to be commit f1a9cf075b87c76c032d19da0168424c90f6cb3c) --- source3/smbd/trans2.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source3/smbd/trans2.c') diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 43437469d7..329d5bb0a5 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -4505,7 +4505,6 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n", uint32 lock_pid; BOOL lock_blocking; enum brl_type lock_type; - BOOL my_lock_ctx; if (fsp == NULL || fsp->fh->fd == -1) { return ERROR_NT(NT_STATUS_INVALID_HANDLE); @@ -4564,8 +4563,7 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n", count, offset, lock_type, - POSIX_LOCK, - &my_lock_ctx); + POSIX_LOCK); if (lock_blocking && lp_blocking_locks(SNUM(conn)) && ERROR_WAS_LOCK_DENIED(status)) { /* -- cgit