[systemd/f21] Fix memory limit cgroup bug

[Zbigniew Jędrzejewski-Szmek]

commit a118d76df9df715a411fc7657d40f8c8aab3f5bc
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Feb 5 08:36:29 2015 -0500

    Fix memory limit cgroup bug

 0203-core-cgroup-fix-embarrassing-typo.patch       |   24 ++++++++++++++++++++
 ...ad-hwdb.patch => hwdb-add-a-touchpad-hwdb.patch |    0
 ...en-we-detect-the-journal-file-we-are-abou.patch |    0
 systemd.spec                                       |   13 ++++++----
 4 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/0203-core-cgroup-fix-embarrassing-typo.patch b/0203-core-cgroup-fix-embarrassing-typo.patch
new file mode 100644
index 0000000..6a53592
--- /dev/null
+++ b/0203-core-cgroup-fix-embarrassing-typo.patch
@@ -0,0 +1,24 @@
+From a64a24640cb66aef9468a50be6577490dfa2a83a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Sat, 31 Jan 2015 23:03:25 -0500
+Subject: [PATCH] core/cgroup: fix embarrassing typo
+
+https://github.com/docker/docker/issues/10280
+(cherry picked from commit a3bd89ea99214db7ca2ad6ae59181d5119a54f09)
+---
+ src/core/cgroup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/cgroup.c b/src/core/cgroup.c
+index 37db3d5289..7edb802f3f 100644
+--- a/src/core/cgroup.c
++++ b/src/core/cgroup.c
+@@ -382,7 +382,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
+                 }
+         }
+ 
+-        if ((mask & CGROUP_MEMORY) & !is_root) {
++        if ((mask & CGROUP_MEMORY) && !is_root) {
+                 if (c->memory_limit != (uint64_t) -1) {
+                         char buf[DECIMAL_STR_MAX(uint64_t) + 1];
+ 
diff --git a/0204-hwdb-add-a-touchpad-hwdb.patch b/hwdb-add-a-touchpad-hwdb.patch
similarity index 100%
rename from 0204-hwdb-add-a-touchpad-hwdb.patch
rename to hwdb-add-a-touchpad-hwdb.patch
diff --git a/0203-journald-when-we-detect-the-journal-file-we-are-abou.patch b/journald-when-we-detect-the-journal-file-we-are-abou.patch
similarity index 100%
rename from 0203-journald-when-we-detect-the-journal-file-we-are-abou.patch
rename to journald-when-we-detect-the-journal-file-we-are-abou.patch
diff --git a/systemd.spec b/systemd.spec
index 4fc619a..7c5c20a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        216
-Release:        18%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        19%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -243,10 +243,10 @@ Patch0199:      0199-util-Add-some-missing-hidden_file-suffixes.patch
 Patch0200:      0200-tmpfiles-make-sure-not-to-concatenate-non-absolute-p.patch
 Patch0201:      0201-sysv-generator-only-allow-regular-files-in-enumerate.patch
 Patch0202:      0202-logind-fix-sd_eviocrevoke-ioctl-call.patch
-Patch0203:      0203-journald-when-we-detect-the-journal-file-we-are-abou.patch
-Patch0204:      0204-hwdb-add-a-touchpad-hwdb.patch
-
+Patch0203:      0203-core-cgroup-fix-embarrassing-typo.patch
 
+Patch0995:      journald-when-we-detect-the-journal-file-we-are-abou.patch
+Patch0996:      hwdb-add-a-touchpad-hwdb.patch
 Patch0997:      units-remove-dev-log-to-always-create-symlink.patch
 Patch0998:      fedora-disable-resolv.conf-symlink.patch
 Patch0999:      fedora-add-bridge-sysctl-configuration.patch
@@ -1034,7 +1034,10 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 %{_datadir}/systemd/gatewayd
 
 %changelog
-* Thu Feb  5 2015 Jan Synáček <jsynacek at redhat.com> - 216-18
+* Thu Feb 05 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 216-19
+- Quick fix for https://github.com/docker/docker/issues/10280
+
+* Thu Feb 05 2015 Jan Synáček <jsynacek at redhat.com> - 216-18
 - RFE: journal: automatically rotate the file if it is unlinked (#1171719)
 - Add the touchpad hwdb (#1189319)