[device-mapper-multipath] device-mapper-multipath-0.4.9-34 Add 0021-RH-fix-oom-adj.patch * don't use OOM_ADJUST_MIN unless y

[Benjamin Marzinski]

commit 57ec838e307ad4cd9ae943e94eb88c2c1c7bcd30
Author: Benjamin Marzinski <bmarzins at redhat.com>
Date:   Tue Oct 23 22:06:46 2012 +0000

    device-mapper-multipath-0.4.9-34
    Add 0021-RH-fix-oom-adj.patch
      * don't use OOM_ADJUST_MIN unless you're sure it's defined

 0021-RH-fix-oom-adj.patch    |   21 +++++++++++++++++++++
 device-mapper-multipath.spec |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/0021-RH-fix-oom-adj.patch b/0021-RH-fix-oom-adj.patch
new file mode 100644
index 0000000..88c53a8
--- /dev/null
+++ b/0021-RH-fix-oom-adj.patch
@@ -0,0 +1,21 @@
+---
+ multipathd/main.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: multipath-tools-120821/multipathd/main.c
+===================================================================
+--- multipath-tools-120821.orig/multipathd/main.c
++++ multipath-tools-120821/multipathd/main.c
+@@ -1568,8 +1568,12 @@ set_oom_adj (void)
+ 				strerror(errno));
+ 			return;
+ 		}
++#ifdef OOM_ADJUST_MIN
+ 		file = "/proc/self/oom_adj";
+ 		score = OOM_ADJUST_MIN;
++#else
++		retry = 0;
++#endif
+ 	} while (retry--);
+ 	condlog(0, "couldn't adjust oom score");
+ }
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 1881795..d0da029 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.9
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -28,6 +28,7 @@ Patch0016: 0016-RH-retain_hwhandler.patch
 Patch0018: 0018-RH-remove-config-dups.patch
 Patch0019: 0019-RH-detect-prio.patch
 Patch0020: 0020-RH-netapp-config.patch
+Patch0021: 0021-RH-fix-oom-adj.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -100,6 +101,7 @@ kpartx manages partition creation and removal for device-mapper devices.
 %patch0018 -p1
 %patch0019 -p1
 %patch0020 -p1
+%patch0021 -p1
 cp %{SOURCE1} .
 
 %build
@@ -186,6 +188,10 @@ bin/systemctl --no-reload enable multipathd.service >/dev/null 2>&1 ||:
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Wed Oct 23 2012 Benjamin Marzinski <bmarizns at redhat.com> 0.4.9-34
+- Add 0021-RH-fix-oom-adj.patch
+  * don't use OOM_ADJUST_MIN unless you're sure it's defined
+
 * Wed Oct 23 2012 Benjamin Marzinski <bmarizns at redhat.com> 0.4.9-33
 - Modify 0016-RH-retain_hwhandler.patch
   * Check the dm-multipath module version, and don't enable