vfp_gpfs: ensure END_PROFILE is always called
authorRalph Boehme <slow@samba.org>
Wed, 29 Apr 2015 18:48:08 +0000 (20:48 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 20 May 2015 14:34:30 +0000 (16:34 +0200)
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)

source3/modules/vfs_gpfs.c

index 2efac192c177dfe0bdcf01b7aac89199a1694a51..baf39b02cb2557d4bb61aab30dc134f218546719 100644 (file)
@@ -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;
 }