From 0a1b6a4b215122a1aa00b571ee4cbfe6061174da Mon Sep 17 00:00:00 2001 From: Markeryang <747675909@qq.com> Date: Thu, 16 Jul 2020 20:07:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=200004-os?= =?UTF-8?q?=5Flinux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...-missing-braces-to-3ware-SELinux-cod.patch | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 0004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch diff --git a/0004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch b/0004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch deleted file mode 100644 index 47b875d..0000000 --- a/0004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8878751819531b402859ec07d23da745a873092a Mon Sep 17 00:00:00 2001 -From: chrfranke -Date: Thu, 16 Nov 2017 21:38:28 +0000 -Subject: [PATCH 028/291] os_linux.cpp: Add missing braces to 3ware SELinux - code. This possibly harmless bug was introduced ~10 years ago in r2510. It is - now detected by g++ 6.3 -Wmisleading-indentation warning. - -git-svn-id: http://svn.code.sf.net/p/smartmontools/code/trunk@4624 4ea69e1a-61f1-4043-bf83-b5c94c648137 ---- - smartmontools/ChangeLog | 4 ++++ - smartmontools/os_linux.cpp | 5 +++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/smartmontools/os_linux.cpp b/smartmontools/os_linux.cpp -index a1fb6a7f..51f78b92 100644 ---- a/smartmontools/os_linux.cpp -+++ b/smartmontools/os_linux.cpp -@@ -5,7 +5,7 @@ - * - * Copyright (C) 2003-11 Bruce Allen - * Copyright (C) 2003-11 Doug Gilbert -- * Copyright (C) 2008-16 Christian Franke -+ * Copyright (C) 2008-17 Christian Franke - * - * Original AACRaid code: - * Copyright (C) 2014 Raghava Aditya -@@ -1626,10 +1626,11 @@ static int setup_3ware_nodes(const char *nodename, const char *driver_name) - pout("Error initializing contexts database for /dev"); - if (getfscreatecon(&orig_context) < 0) { - pout("Error retrieving original SELinux fscreate context"); -- if (selinux_enforced) -+ if (selinux_enforced) { - matchpathcon_fini(); - return 6; - } -+ } - } - #endif - /* Now check if nodes are correct */ --- -2.19.1 -