diff options
| author | Ralph Boehme <slow@samba.org> | 2015-04-29 20:48:08 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-05-20 16:34:30 +0200 |
| commit | 007a5fd308f9185ed12fe26ca7d01c843ef60ce0 (patch) | |
| tree | 550a2d3994348a02ffac325296c114f40cacdb95 | |
| parent | 3db0ad945c0aa083c8acc464472bdff4c8e61d8e (diff) | |
| download | samba-007a5fd308f9185ed12fe26ca7d01c843ef60ce0.tar.gz | |
vfp_gpfs: ensure END_PROFILE is always called
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11244
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Thu Apr 30 19:34:41 CEST 2015 on sn-devel-104
(cherry picked from commit 5e65ae14ddb74c648f31b4dfbacd4af9c02ca058)
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 2efac192c17..baf39b02cb2 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -115,8 +115,12 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp, 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; + } START_PROFILE(syscall_linux_setlease); @@ -132,6 +136,7 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp, END_PROFILE(syscall_linux_setlease); +failure: return ret; } |