The branch, master has been updated
via c56a88d vfs_gpfs: Fix the build with profiling-data
from 92da0b2 s3: winbindd: Old NT Domain code sets struct
winbind_domain->alt_name to be NULL. Ensure this is safe with modern AD-DCs.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c56a88da6ec7be1a0f042270a5750c4834a9e95a
Author: Volker Lendecke <[email protected]>
Date: Fri Sep 12 13:03:52 2014 +0200
vfs_gpfs: Fix the build with profiling-data
This fails with -Werror=declaration-after-statement
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Tue Sep 16 01:55:57 CEST 2014 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_gpfs.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index e722a86..6ead65b 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -78,6 +78,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);
@@ -86,8 +88,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)) {
@@ -121,6 +121,8 @@ 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);
@@ -128,8 +130,6 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle,
files_struct *fsp,
if (linux_set_lease_sighandler(fsp->fh->fd) == -1)
return -1;
- START_PROFILE(syscall_linux_setlease);
-
if (config->leases) {
/*
* Ensure the lease owner is root to allow
--
Samba Shared Repository
