Attachment 15224 Details for Bug 13984 – Patch for 4.9 and 4.10

[patch] Patch for 4.9 and 4.10

BZ13984.patch (text/plain), 1.42 KB, created by Martin Schwenke on 2019-06-06 12:38:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2019-06-06 12:38:32 UTC

Size: 1.42 KB

patch

obsolete

>From d4cb90e75001a271fc5c1c475df869fd67e0ead8 Mon Sep 17 00:00:00 2001
>From: Rafael David Tinoco via samba-technical
> <samba-technical@lists.samba.org>
>Date: Sun, 2 Jun 2019 23:44:15 -0300
>Subject: [PATCH] ctdb-scripts: Fix tcp_tw_recycle existence check
>
>net.ipv4.tcp_tw_recycle has been removed from Linux 4.12 but, still,
>makes sense to check its existence. Unfortunately, current check does
>not test for the procfs file existence. This commit fixes the issue.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13984
>
>Signed-off-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Tue Jun  4 23:31:24 UTC 2019 on sn-devel-184
>
>(cherry picked from commit 843fbb1207ee7ac84f3282974b66b9290d8da0ac)
>---
> ctdb/config/nfs-linux-kernel-callout | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/ctdb/config/nfs-linux-kernel-callout b/ctdb/config/nfs-linux-kernel-callout
>index 3d1dc63c590..12ed17c6d9e 100755
>--- a/ctdb/config/nfs-linux-kernel-callout
>+++ b/ctdb/config/nfs-linux-kernel-callout
>@@ -281,8 +281,8 @@ nfs_startup ()
>     basic_stop "nfs" || true
>     basic_start "nfs"
>     _f="${PROCFS_PATH}/sys/net/ipv4/tcp_tw_recycle"
>-    if [ "$_f" ] ; then
>-	echo 1 >"$_f"
>+    if [ -f "$_f" ] ; then
>+	    echo 1 >"$_f"
>     fi
> }
> 
>-- 
>2.20.1
>

Flags:

amitay: review+

Actions: View

Attachments on bug 13984: 15224