[SCM] Samba Shared Repository - branch master updated
Ralph Böhme
slow at samba.org
Thu Apr 30 11:35:04 MDT 2015
The branch, master has been updated
via 5e65ae1 vfp_gpfs: ensure END_PROFILE is always called
from 316ace6 s3-rpc_server: fix rpc_create_tcpip_sockets() processing of interfaces.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5e65ae14ddb74c648f31b4dfbacd4af9c02ca058
Author: Ralph Boehme <slow at samba.org>
Date: Wed Apr 29 20:48:08 2015 +0200
vfp_gpfs: ensure END_PROFILE is always called
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11244
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Christof Schmitt <cs at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Thu Apr 30 19:34:41 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_gpfs.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 6ab17d5..a1912df 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -125,8 +125,6 @@ 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);
@@ -145,6 +143,8 @@ 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)) {
@@ -198,14 +198,16 @@ 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);
- if (linux_set_lease_sighandler(fsp->fh->fd) == -1)
- return -1;
+ START_PROFILE(syscall_linux_setlease);
+
+ if (linux_set_lease_sighandler(fsp->fh->fd) == -1) {
+ ret = -1;
+ goto failure;
+ }
if (config->leases) {
/*
@@ -219,6 +221,7 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp,
END_PROFILE(syscall_linux_setlease);
+failure:
return ret;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list