Attachment 12895 Details for Bug 12549 – Patches for v4-6

[patch] Patches for v4-6

BZ12549-v4-6.patch (text/plain), 1.08 KB, created by Amitay Isaacs on 2017-02-01 13:43:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2017-02-01 13:43:48 UTC

Size: 1.08 KB

patch

obsolete

>From b8c44646b4d6eb6719c78498e8968b8b4d4f8711 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Wed, 1 Feb 2017 15:52:48 +1100
>Subject: [PATCH] ctdb-common: ioctl(.. FIONREAD ..) returns an int value
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12549
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Wed Feb  1 14:29:14 CET 2017 on sn-devel-144
>
>(cherry picked from commit 2bea45e450e5ebd6544c2a8be4493242158b712e)
>---
> ctdb/common/run_proc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/ctdb/common/run_proc.c b/ctdb/common/run_proc.c
>index 96e422c..f9fee80 100644
>--- a/ctdb/common/run_proc.c
>+++ b/ctdb/common/run_proc.c
>@@ -132,8 +132,9 @@ static void proc_read_handler(struct tevent_context *ev,
> {
> 	struct proc_context *proc = talloc_get_type_abort(
> 		private_data, struct proc_context);
>-	size_t offset, len = 0;
>+	size_t offset;
> 	ssize_t nread;
>+	int len = 0;
> 	int ret;
> 
> 	ret = ioctl(proc->fd, FIONREAD, &len);
>-- 
>2.9.3
>

Flags:

vl: review+
martins: review+

Actions: View

Attachments on bug 12549: 12895