vfs_gpfs: Fix the build with profiling-data
authorVolker Lendecke <vl@samba.org>
Fri, 12 Sep 2014 11:03:52 +0000 (13:03 +0200)
committerJeremy Allison <jra@samba.org>
Mon, 15 Sep 2014 23:55:57 +0000 (01:55 +0200)
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

source3/modules/vfs_gpfs.c

index e722a868a53dfbbc45cec8b37862fccff74d5896..6ead65b943af2dfe802ea7d7b0c9e9c713a01580 100644 (file)
@@ -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