summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-09-12 13:03:52 +0200
committerJeremy Allison <jra@samba.org>2014-09-16 01:55:57 +0200
commitc56a88da6ec7be1a0f042270a5750c4834a9e95a (patch)
tree5fde66d5486ef24b3264242eaead15fcb0e4b044
parent92da0b243c18546275c4736507188eba425a0732 (diff)
downloadsamba-c56a88da6ec7be1a0f042270a5750c4834a9e95a.tar.gz
samba-c56a88da6ec7be1a0f042270a5750c4834a9e95a.tar.xz
samba-c56a88da6ec7be1a0f042270a5750c4834a9e95a.zip
vfs_gpfs: Fix the build with profiling-data
This fails with -Werror=declaration-after-statement Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Sep 16 01:55:57 CEST 2014 on sn-devel-104
-rw-r--r--source3/modules/vfs_gpfs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index e722a868a5..6ead65b943 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