- up to 4.4.188

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 69d9d5857e749d779e692af37a4989e8cac9b585..cf828c8b196d78b207a452fa5c0c97fe707f61e6 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -12751,12 +12751,16 @@ diff -NurpP --minimal linux-4.4.161/ipc/mqueue.c linux-4.4.161-vs2.3.9.8/ipc/mqu
        } else if (S_ISDIR(mode)) {
                inc_nlink(inode);
                /* Some things misbehave if size == 0 on a directory */
-@@ -398,8 +406,11 @@ static void mqueue_evict_inode(struct in
- 
+@@ -402,6 +402,7 @@ static void mqueue_evict_inode(struct in
        user = info->user;
        if (user) {
+               unsigned long mq_bytes, mq_treesize;
 +              struct vx_info *vxi = info->vxi;
-+
+ 
+               /* Total amount of bytes accounted for the mqueue */
+               mq_treesize = info->attr.mq_maxmsg * sizeof(struct msg_msg) +
+@@ -413,6 +414,7 @@ static void mqueue_evict_inode(struct in
+ 
                spin_lock(&mq_lock);
                user->mq_bytes -= mq_bytes;
 +              vx_ipcmsg_sub(vxi, user, mq_bytes);

diff --git a/kernel.spec b/kernel.spec
index 98f2cf2b28ebc0ce09fa93a98a06427c9f1a35c6..72145276b2dcbbd1df52eb41c80713622c2cb118 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
 
 %define                rel             1
 %define                basever         4.4
-%define                postver         .187
+%define                postver         .188
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -124,7 +124,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  2381f70f5377104567413788ca9f3bf1
+# Patch0-md5:  f673cf743ed9c5ad805bffcf39a10e99
 %endif
 Source1:       kernel.sysconfig