[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  2a7317e0b25 s3:wscript: vfs_gpfs needs kernel oplock support
      from  58adf349edf s3:smbd: check for stale pid in delay_for_oplock_fn() when leases_db_get() fails

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2a7317e0b25ff231951b960e8f0a835d4bb724e7
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri May 29 01:39:00 2020 -0700

    s3:wscript: vfs_gpfs needs kernel oplock support
    
    It uses symbols, which are only available if we have
    HAVE_KERNEL_OPLOCKS_LINUX defined.
    
    This is not the case when building withing the
    Windows Subsystem for Liux (WSL). So we better don't try to
    build the vfs_gpfs module there.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Jul  7 09:37:37 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 2a341df7c3e..5e94c6f6c71 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1999,7 +1999,7 @@ main() {
     if conf.CONFIG_SET('DARWINOS'):
         default_static_modules.extend(TO_LIST('charset_macosxfs'))
 
-    if conf.CONFIG_SET('HAVE_GPFS'):
+    if conf.CONFIG_SET('HAVE_GPFS') and conf.CONFIG_SET('HAVE_KERNEL_OPLOCKS_LINUX'):
         default_shared_modules.extend(TO_LIST('vfs_gpfs'))
 
     if (conf.CONFIG_SET('HAVE_LINUX_IOCTL')


-- 
Samba Shared Repository