From: Greg Kroah-Hartman Date: Sat, 3 Jul 2010 02:00:08 +0000 (-0700) Subject: delete some ext2 patches X-Git-Tag: v2.6.31.14~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21b5a55738938a467e3774a1fe4d06e6b8c294f5;p=thirdparty%2Fkernel%2Fstable-queue.git delete some ext2 patches --- diff --git a/review-2.6.32/ext4-check-s_log_groups_per_flex-in-online-resize-code.patch b/review-2.6.32/ext4-check-s_log_groups_per_flex-in-online-resize-code.patch deleted file mode 100644 index d8da3214c52..00000000000 --- a/review-2.6.32/ext4-check-s_log_groups_per_flex-in-online-resize-code.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 42007efd569f1cf3bfb9a61da60ef6c2179508ca Mon Sep 17 00:00:00 2001 -From: Eric Sandeen -Date: Sun, 16 May 2010 01:00:00 -0400 -Subject: ext4: check s_log_groups_per_flex in online resize code - -From: Eric Sandeen - -commit 42007efd569f1cf3bfb9a61da60ef6c2179508ca upstream. - -If groups_per_flex < 2, sbi->s_flex_groups[] doesn't get filled out, -and every other access to this first tests s_log_groups_per_flex; -same thing needs to happen in resize or we'll wander off into -a null pointer when doing an online resize of the file system. - -Thanks to Christoph Biedl, who came up with the trivial testcase: - -# truncate --size 128M fsfile -# mkfs.ext3 -F fsfile -# tune2fs -O extents,uninit_bg,dir_index,flex_bg,huge_file,dir_nlink,extra_isize fsfile -# e2fsck -yDf -C0 fsfile -# truncate --size 132M fsfile -# losetup /dev/loop0 fsfile -# mount /dev/loop0 mnt -# resize2fs -p /dev/loop0 - - https://bugzilla.kernel.org/show_bug.cgi?id=13549 - -Reported-by: Alessandro Polverini -Test-case-by: Christoph Biedl -Signed-off-by: Eric Sandeen -Signed-off-by: "Theodore Ts'o" -Signed-off-by: Greg Kroah-Hartman - ---- - fs/ext4/resize.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/fs/ext4/resize.c -+++ b/fs/ext4/resize.c -@@ -930,7 +930,8 @@ int ext4_group_add(struct super_block *s - percpu_counter_add(&sbi->s_freeinodes_counter, - EXT4_INODES_PER_GROUP(sb)); - -- if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) { -+ if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG) && -+ sbi->s_log_groups_per_flex) { - ext4_group_t flex_group; - flex_group = ext4_flex_group(sbi, input->group); - atomic_add(input->free_blocks_count, diff --git a/review-2.6.32/ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch b/review-2.6.32/ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch deleted file mode 100644 index cf9e3555539..00000000000 --- a/review-2.6.32/ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1f5a81e41f8b1a782c68d3843e9ec1bfaadf7d72 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o -Date: Wed, 2 Jun 2010 22:04:39 -0400 -Subject: ext4: Make sure the MOVE_EXT ioctl can't overwrite append-only files - -From: Theodore Ts'o - -commit 1f5a81e41f8b1a782c68d3843e9ec1bfaadf7d72 upstream. - -Dan Roseberg has reported a problem with the MOVE_EXT ioctl. If the -donor file is an append-only file, we should not allow the operation -to proceed, lest we end up overwriting the contents of an append-only -file. - -Signed-off-by: "Theodore Ts'o" -Cc: Dan Rosenberg -Signed-off-by: Greg Kroah-Hartman - ---- - fs/ext4/move_extent.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/fs/ext4/move_extent.c -+++ b/fs/ext4/move_extent.c -@@ -964,6 +964,9 @@ mext_check_arguments(struct inode *orig_ - return -EINVAL; - } - -+ if (IS_IMMUTABLE(donor_inode) || IS_APPEND(donor_inode)) -+ return -EPERM; -+ - /* Ext4 move extent does not support swapfile */ - if (IS_SWAPFILE(orig_inode) || IS_SWAPFILE(donor_inode)) { - ext4_debug("ext4 move extent: The argument files should " diff --git a/review-2.6.32/series b/review-2.6.32/series index ad648237f35..db1415beecd 100644 --- a/review-2.6.32/series +++ b/review-2.6.32/series @@ -116,8 +116,6 @@ iwlwifi-check-for-aggregation-frame-and-queue.patch iwlwifi-recalculate-average-tpt-if-not-current.patch iwlwifi-update-supported-pci_id-list-for-5xx0-series.patch wl1251-fix-a-memory-leak-in-probe.patch -ext4-check-s_log_groups_per_flex-in-online-resize-code.patch -ext4-make-sure-the-move_ext-ioctl-can-t-overwrite-append-only-files.patch gfs2-fix-permissions-checking-for-setflags-ioctl.patch sctp-fix-skb_over_panic-resulting-from-multiple-invalid-parameter-errors-cve-2010-1173-v4.patch cifs-allow-null-nd-as-nfs-server-uses-on-create.patch