From 0a85f9d4f022fc9fb50dc341a8ff8026f132b793 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 27 May 2010 05:43:21 +0000 Subject: [PATCH] bump to 2.6.27.47 --- kernel-2.6.spec | 3 +-- linux-2.6-810-ext4-cap-check-delay.patch | 34 ------------------------ sources | 4 +-- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 linux-2.6-810-ext4-cap-check-delay.patch diff --git a/kernel-2.6.spec b/kernel-2.6.spec index afe68b34b..9fdef82b6 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -37,7 +37,7 @@ Summary: The Linux kernel (the core of the Linux operating system) # adding some text to the end of the version number. # %define sublevel 27 -%define patchlevel 46 +%define patchlevel 47 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}} @@ -184,7 +184,6 @@ Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch # Ext4 Patch800: linux-2.6-800-rename-ext4dev-to-ext4.patch -Patch810: linux-2.6-810-ext4-cap-check-delay.patch #Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch #Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch diff --git a/linux-2.6-810-ext4-cap-check-delay.patch b/linux-2.6-810-ext4-cap-check-delay.patch deleted file mode 100644 index 978568593..000000000 --- a/linux-2.6-810-ext4-cap-check-delay.patch +++ /dev/null @@ -1,34 +0,0 @@ -Safer version of upstream commit a996031c87e093017c0763326a08896a3a4817f4 - -Delay capable() checks to avoid (most) AVC denials when checking free blocks -(Bug 478299 - AVC denials on kernel 2.6.27.9-159.fc10.x86_64) - -Signed-off-by: Eric Sandeen ---- - -Index: linux-2.6.27.y/fs/ext4/balloc.c -=================================================================== ---- linux-2.6.27.y.orig/fs/ext4/balloc.c -+++ linux-2.6.27.y/fs/ext4/balloc.c -@@ -1770,15 +1770,15 @@ out: - ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi, - ext4_fsblk_t nblocks) - { -- ext4_fsblk_t free_blocks; -- ext4_fsblk_t root_blocks = 0; -+ ext4_fsblk_t free_blocks, root_blocks; - - free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); -+ root_blocks = ext4_r_blocks_count(sbi->s_es); - -- if (!capable(CAP_SYS_RESOURCE) && -- sbi->s_resuid != current->fsuid && -- (sbi->s_resgid == 0 || !in_group_p(sbi->s_resgid))) -- root_blocks = ext4_r_blocks_count(sbi->s_es); -+ if (sbi->s_resuid == current->fsuid || -+ ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) || -+ capable(CAP_SYS_RESOURCE)) -+ root_blocks = 0; - #ifdef CONFIG_SMP - if (free_blocks - root_blocks < FBC_BATCH) - free_blocks = diff --git a/sources b/sources index 691a336b6..fd7800f3b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ b3e78977aa79d3754cb7f8143d7ddabd http://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 -9ba438c8ab695b92fed5c170e257bebd http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.46.bz2 -f5fdebad83fcfaf555725ee8dcdf95e6 http://www.cs.princeton.edu/~caglar/patch-2.6.27.46-vs2.3.0.36.4.diff +cc7b6446a06f336f5b0744a33a82eab0 http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.47.bz2 +f5fdebad83fcfaf555725ee8dcdf95e6 http://www.cs.princeton.edu/~caglar/patch-2.6.27.47-vs2.3.0.36.4.diff -- 2.47.0