Attachment 11005 Details for Bug 11244 – Patch for master

[patch] Patch for master

end_profile.patch (text/plain), 1.79 KB, created by Ralph Böhme on 2015-04-30 09:08:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2015-04-30 09:08:53 UTC

Size: 1.79 KB

patch

obsolete

>From 360aef6bb99dfc0804b59c7ab98bbc4d63d767cb Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Wed, 29 Apr 2015 20:48:08 +0200
>Subject: [PATCH] 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>
>---
> source3/modules/vfs_gpfs.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
>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;
> }
> 
>-- 
>2.1.0
>

Flags:

cs: review+

Actions: View

Attachments on bug 11244: 11005 | 11013 | 11032 | 11033