From c79a4a0f20dd7ceb99d4464e07085ae6fb40e6f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 31 May 2018 12:36:56 +0200 Subject: [PATCH] - up to 4.9.105 --- kernel-vserver-2.3.patch | 9 --------- kernel.spec | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 3689dab6..69853076 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -2222,15 +2222,6 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext #include "ext2.h" #include "acl.h" #include "xattr.h" -@@ -1271,7 +1272,7 @@ static void ext2_truncate_blocks(struct - return; - if (ext2_inode_is_fast_symlink(inode)) - return; -- if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) -+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode)) - return; - - dax_sem_down_write(EXT2_I(inode)); @@ -1367,39 +1368,61 @@ void ext2_set_inode_flags(struct inode * { unsigned int flags = EXT2_I(inode)->i_flags; diff --git a/kernel.spec b/kernel.spec index 49905864..df48fc91 100644 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ %define rel 1 %define basever 4.9 -%define postver .102 +%define postver .105 # 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: d5d3778f178a257a4051c1e9d384ffbf +# Patch0-md5: 485687b9a875fb5f166bb7a2de819b3d %endif Source1: kernel.sysconfig -- 2.44.0