[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Wed Nov 4 22:54:01 UTC 2020
The branch, master has been updated
via a51cda69ec6 s3-vfs_glusterfs: always disable write-behind translator
via 80ff5a37c7f VFS-License-clarification: minor improvements aligning w/ GPLv3 text
from 3e8ce497f3d libsmb: Remove cli_state->dfs_mountpoint
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a51cda69ec6a017ad04b5690a3ae67a5478deee9
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 2 16:10:44 2020 +0100
s3-vfs_glusterfs: always disable write-behind translator
The "pass-through" option has now been merged upstream as of:
https://github.com/gluster/glusterfs/pull/1640
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14486
Guenther
Signed-off-by: Guenther Deschner <gd at samba.org>
Pair-Programmed-With: Anoop C S <anoopcs at samba.org>
Pair-Programmed-With: Sachin Prabhu <sprabhu at redhat.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Wed Nov 4 22:53:49 UTC 2020 on sn-devel-184
commit 80ff5a37c7f1516123dc129d023d78323f91d53d
Author: Bradley M. Kuhn <bkuhn at sfconservancy.org>
Date: Mon Oct 26 14:29:00 2020 -0700
VFS-License-clarification: minor improvements aligning w/ GPLv3 text
The phrase "derived work" and word "derived" don't appear in GPLv3;
instead, GPLv3 uses the phrases "modified version" and "based on" to
implement the strong copyleft clause. Herein, align the VFS
statement with the phrases as they appear in the GPLv3 since Samba's
license is GPLv3-or-later.
Included are also a few other very minor wording changes as suggested
by legal counsel who is experienced with presenting these sorts of
licensing statements to company lawyers and suggests these changes
will comfort that constituency.
Finally, update both occurrences of the statement in the codebase in
two different files.
Signed-off-by: Bradley M. Kuhn <bkuhn at sfconservancy.org>
Reviewed-by: Jim McDonough <jmcd at samba.org>
Reviewed-by: Karolin Seeger <kseeger at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
VFS-License-clarification.txt | 18 +++++++++---------
WHATSNEW.txt | 18 +++++++++---------
source3/modules/vfs_glusterfs.c | 20 +++++++++++++++++---
source3/wscript | 3 +++
4 files changed, 38 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/VFS-License-clarification.txt b/VFS-License-clarification.txt
index 6b67381cc20..491fb1e6153 100644
--- a/VFS-License-clarification.txt
+++ b/VFS-License-clarification.txt
@@ -1,9 +1,9 @@
-A clarification of the GNU GPL License boundary within the Samba
+A clarification of our GNU GPL License enforcement boundary within the Samba
Virtual File System (VFS) layer.
Samba is licensed under the GNU GPL. All code committed to the Samba
-project or creating a derived work must be either licensed under the
-GNU GPL or a compatible license.
+project or that creates a "modified version" or software "based on" Samba must
+be either licensed under the GNU GPL or a compatible license.
Samba has several plug-in interfaces where external code may be called
from Samba GNU GPL licensed code. The most important of these is the
@@ -20,9 +20,9 @@ developed and maintained.
As long as these third-party external libraries do not use any of the
Samba internal structure, APIs or interface definitions created by the
-Samba project that are licensed under the GNU GPL then it is the view
-of the Samba Team that such third-party external libraries called from
-Samba VFS modules are not part of the Samba code and cannot be
-considered a derived work of Samba for the purposes of GNU GPL
-licensing. Thus such libraries are not required to be under the GNU
-GPL or a GNU GPL compatible license.
+Samba project (to the extent that they would be considered subject to the GNU
+GPL), then the Samba Team will not consider such third-party external
+libraries called from Samba VFS modules as "based on" and/or creating a
+"modified version" of the Samba code for the purposes of GNU GPL.
+Accordingly, we do not require such libraries be licensed under the GNU GPL
+or a GNU GPL compatible license.
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index ffcf634030d..7651b0af564 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -20,12 +20,12 @@ Here is a copy of a clarification note added to the Samba code
in the file: VFS-License-clarification.txt.
--------------------------------------------------------------
-A clarification of the GNU GPL License boundary within the Samba
+A clarification of our GNU GPL License enforcement boundary within the Samba
Virtual File System (VFS) layer.
Samba is licensed under the GNU GPL. All code committed to the Samba
-project or creating a derived work must be either licensed under the
-GNU GPL or a compatible license.
+project or that creates a "modified version" or software "based on" Samba must
+be either licensed under the GNU GPL or a compatible license.
Samba has several plug-in interfaces where external code may be called
from Samba GNU GPL licensed code. The most important of these is the
@@ -42,12 +42,12 @@ developed and maintained.
As long as these third-party external libraries do not use any of the
Samba internal structure, APIs or interface definitions created by the
-Samba project that are licensed under the GNU GPL then it is the view
-of the Samba Team that such third-party external libraries called from
-Samba VFS modules are not part of the Samba code and cannot be
-considered a derived work of Samba for the purposes of GNU GPL
-licensing. Thus such libraries are not required to be under the GNU
-GPL or a GNU GPL compatible license.
+Samba project (to the extent that they would be considered subject to the GNU
+GPL), then the Samba Team will not consider such third-party external
+libraries called from Samba VFS modules as "based on" and/or creating a
+"modified version" of the Samba code for the purposes of GNU GPL.
+Accordingly, we do not require such libraries be licensed under the GNU GPL
+or a GNU GPL compatible license.
Client Group Policy
-------------------
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index dacedd8e04a..1ed6235e37f 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -363,6 +363,7 @@ static int vfs_gluster_connect(struct vfs_handle_struct *handle,
glfs_t *fs = NULL;
TALLOC_CTX *tmp_ctx;
int ret = 0;
+ bool write_behind_pass_through_set = false;
tmp_ctx = talloc_new(NULL);
if (tmp_ctx == NULL) {
@@ -435,6 +436,17 @@ static int vfs_gluster_connect(struct vfs_handle_struct *handle,
goto done;
}
+#ifdef HAVE_GFAPI_VER_7_9
+ ret = glfs_set_xlator_option(fs, "*-write-behind", "pass-through",
+ "true");
+ if (ret < 0) {
+ DBG_ERR("%s: Failed to set xlator option: pass-through\n",
+ volume);
+ goto done;
+ }
+ write_behind_pass_through_set = true;
+#endif
+
ret = glfs_set_logging(fs, logfile, loglevel);
if (ret < 0) {
DEBUG(0, ("%s: Failed to set logfile %s loglevel %d\n",
@@ -449,9 +461,11 @@ static int vfs_gluster_connect(struct vfs_handle_struct *handle,
goto done;
}
- ret = check_for_write_behind_translator(tmp_ctx, fs, volume);
- if (ret < 0) {
- goto done;
+ if (!write_behind_pass_through_set) {
+ ret = check_for_write_behind_translator(tmp_ctx, fs, volume);
+ if (ret < 0) {
+ goto done;
+ }
}
ret = glfs_set_preopened(volume, handle->conn->connectpath, fs);
diff --git a/source3/wscript b/source3/wscript
index d3ef346eecd..8829ce880cd 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1766,6 +1766,9 @@ main() {
conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 7.6" --cflags --libs',
msg='Checking for glusterfs-api >= 7.6',
uselib_store="GFAPI_VER_7_6")
+ conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 7.9" --cflags --libs',
+ msg='Checking for glusterfs-api >= 7.9',
+ uselib_store="GFAPI_VER_7_9")
else:
conf.SET_TARGET_TYPE('gfapi', 'EMPTY')
conf.undefine('HAVE_GLUSTERFS')
--
Samba Shared Repository
More information about the samba-cvs
mailing list