- up to 4.9.188

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index b79866894ca4ffd21dd459c507f12f0f3aa59ec8..d64b406890248b183a0e773814e0f534e908250d 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -12712,12 +12712,16 @@ diff -NurpP --minimal linux-4.9.135/ipc/mqueue.c linux-4.9.135-vs2.3.9.8/ipc/mqu
        } else if (S_ISDIR(mode)) {
                inc_nlink(inode);
                /* Some things misbehave if size == 0 on a directory */
-@@ -396,8 +404,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 fca142e16b323f4411b38e5e0298821b617bc3a9..35b6c3d17475c2748b7501addd9e3316ec942d32 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define                rel             1
 %define                basever         4.9
-%define                postver         .187
+%define                postver         .188
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -125,7 +125,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  24aa08a43c838efb5cade1cc369a7947
+# Patch0-md5:  aa00e932109b9513d49bd5b6456a7f0c
 %endif
 Source1:       kernel.sysconfig