From 6bad036941eb89bc8efcf4641c4a900260a1688d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 5 Nov 2015 13:35:23 +0100 Subject: [PATCH 1/2] 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 --- source3/modules/vfs_gpfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index ee4c1f6..22b1b30 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); @@ -144,8 +146,6 @@ static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *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 +199,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; -- 1.7.9.5 From d667731f7d5bb6e7dddfacbf4504110a4fda4d5f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 5 Nov 2015 13:22:33 +0100 Subject: [PATCH 2/2] 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 --- source3/modules/vfs_gpfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 22b1b30..dc53da0 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -141,7 +141,8 @@ 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; } -- 1.7.9.5