[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  23663b9 vfs_gpfs: Re-enable share modes
       via  2515ad7 vfs_gpfs: Fix the build with -Werror=declaration-after-statement
      from  ce8068e remove many valgrind errors for base.lock test

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


- Log -----------------------------------------------------------------
commit 23663b9719877e1c87af258aba1ab1c69eb5768b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 5 13:22:33 2015 +0100

    vfs_gpfs: Re-enable share modes
    
    is_ntfs_default_stream_smb_fname returns false for a NULL stream name, so for
    streamless filenames we do not set gpfs share modes without this patch.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11243
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Nov  6 03:21:01 CET 2015 on sn-devel-104

commit 2515ad78a75dd19a5147410db29b16bfcbbe71bd
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 5 13:35:23 2015 +0100

    vfs_gpfs: Fix the build with -Werror=declaration-after-statement
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11243
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 source3/modules/vfs_gpfs.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index ee4c1f6..dc53da0 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -126,6 +126,8 @@ static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
 	struct gpfs_config_data *config;
 	int ret = 0;
 
+	START_PROFILE(syscall_kernel_flock);
+
 	SMB_VFS_HANDLE_GET_DATA(handle, config,
 				struct gpfs_config_data,
 				return -1);
@@ -139,13 +141,12 @@ static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
 	 * fd, so lacking a distinct fd for the stream we have to skip
 	 * kernel_flock and set_gpfs_sharemode for stream.
 	 */
-	if (!is_ntfs_default_stream_smb_fname(fsp->fsp_name)) {
+	if (is_ntfs_stream_smb_fname(fsp->fsp_name) &&
+	    !is_ntfs_default_stream_smb_fname(fsp->fsp_name)) {
 		DEBUG(2,("%s: kernel_flock on stream\n", fsp_str_dbg(fsp)));
 		return 0;
 	}
 
-	START_PROFILE(syscall_kernel_flock);
-
 	kernel_flock(fsp->fh->fd, share_mode, access_mask);
 
 	if (!set_gpfs_sharemode(fsp, access_mask, fsp->share_access)) {
@@ -199,12 +200,12 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp,
 	struct gpfs_config_data *config;
 	int ret=0;
 
+	START_PROFILE(syscall_linux_setlease);
+
 	SMB_VFS_HANDLE_GET_DATA(handle, config,
 				struct gpfs_config_data,
 				return -1);
 
-	START_PROFILE(syscall_linux_setlease);
-
 	if (linux_set_lease_sighandler(fsp->fh->fd) == -1) {
 		ret = -1;
 		goto failure;


-- 
Samba Shared Repository