continued the split of the kernel level oplocks code into a more

modular form. In this pass I added oplock_irix.c and added a "struct
kernel_oplocks" that describes a kernel oplock implementation.
(This used to be commit b5ceab810292602ea9a81696c20a781c16b706c2)

1 files changed, 1 insertions, 31 deletions

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8f23d20796..ef62fc82ca 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1429,6 +1429,7 @@ FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache)
 FN_GLOBAL_BOOL(lp_allow_trusted_domains, &Globals.bAllowTrustedDomains)
 FN_GLOBAL_BOOL(lp_restrict_anonymous, &Globals.bRestrictAnonymous)
 FN_GLOBAL_BOOL(lp_host_msdfs, &Globals.bHostMSDfs)
+FN_GLOBAL_BOOL(lp_kernel_oplocks, &Globals.bKernelOplocks)
 FN_GLOBAL_INTEGER(lp_os_level, &Globals.os_level)
 FN_GLOBAL_INTEGER(lp_max_ttl, &Globals.max_ttl)
 FN_GLOBAL_INTEGER(lp_max_wins_ttl, &Globals.max_wins_ttl)
@@ -3439,37 +3440,6 @@ void lp_set_name_resolve_order(char *new_order)
 }
 
 /***********************************************************
- Set the flag that says if kernel oplocks are available 
- (called by smbd).
-************************************************************/
-
-static BOOL kernel_oplocks_available = False;
-
-void lp_set_kernel_oplocks(BOOL val)
-{
-	/*
-	 * Only set this to True if kerenl
-	 * oplocks are really available and were
-	 * turned on in the smb.conf file.
-	 */
-
-	if (Globals.bKernelOplocks && val)
-		kernel_oplocks_available = True;
-	else
-		kernel_oplocks_available = False;
-}
-
-/***********************************************************
- Return True if kernel oplocks are available and were turned
- on in smb.conf.
-************************************************************/
-
-BOOL lp_kernel_oplocks(void)
-{
-	return kernel_oplocks_available;
-}
-
-/***********************************************************
  Functions to return the current security masks/modes. If
  set to -1 then return the create mask/mode instead.
 ************************************************************/