From 15cf0e847009faf7fb90bd7e9e27db6999c88eef Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 9 Jun 2000 06:58:06 +0000
Subject: clean up oplock capability code ready for Linux code (This used to be
 commit 70dcc791b45ac64fc536ef449e4e6b53b2b68fd4)

---
 source3/lib/system.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'source3/lib/system.c')

diff --git a/source3/lib/system.c b/source3/lib/system.c
index 80a968b634..3a9cca6a72 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -438,13 +438,12 @@ struct hostent *sys_gethostbyname(const char *name)
 }
 
 
+#if defined(HAVE_IRIX_SPECIFIC_CAPABILITIES)
 /**************************************************************************
  Try and abstract process capabilities (for systems that have them).
 ****************************************************************************/
-
-BOOL set_process_capability( uint32 cap_flag, BOOL enable )
+static BOOL set_process_capability( uint32 cap_flag, BOOL enable )
 {
-#if defined(HAVE_IRIX_SPECIFIC_CAPABILITIES)
   if(cap_flag == KERNEL_OPLOCK_CAPABILITY)
   {
     cap_t cap = cap_get_proc();
@@ -471,7 +470,6 @@ BOOL set_process_capability( uint32 cap_flag, BOOL enable )
 
     DEBUG(10,("set_process_capability: Set KERNEL_OPLOCK_CAPABILITY.\n"));
   }
-#endif
   return True;
 }
 
@@ -479,9 +477,8 @@ BOOL set_process_capability( uint32 cap_flag, BOOL enable )
  Try and abstract inherited process capabilities (for systems that have them).
 ****************************************************************************/
 
-BOOL set_inherited_process_capability( uint32 cap_flag, BOOL enable )
+static BOOL set_inherited_process_capability( uint32 cap_flag, BOOL enable )
 {
-#if defined(HAVE_IRIX_SPECIFIC_CAPABILITIES)
   if(cap_flag == KERNEL_OPLOCK_CAPABILITY)
   {
     cap_t cap = cap_get_proc();
@@ -508,9 +505,20 @@ BOOL set_inherited_process_capability( uint32 cap_flag, BOOL enable )
 
     DEBUG(10,("set_inherited_process_capability: Set KERNEL_OPLOCK_CAPABILITY.\n"));
   }
-#endif
   return True;
 }
+#endif
+
+/****************************************************************************
+gain the oplock capability from the kernel if possible
+****************************************************************************/
+void oplock_set_capability(BOOL this_process, BOOL inherit)
+{
+#if HAVE_KERNEL_OPLOCKS_IRIX
+	set_process_capability(KERNEL_OPLOCK_CAPABILITY,this_process);
+	set_inherited_process_capability(KERNEL_OPLOCK_CAPABILITY,inherit);
+#endif
+}
 
 /**************************************************************************
  Wrapper for random().
-- 
cgit