From: Greg Kroah-Hartman Date: Mon, 27 Sep 2010 00:16:43 +0000 (-0700) Subject: remove bdi patch per Jens's request. X-Git-Tag: v2.6.35.6~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d317cea3c1d2d51b8ef7241cf07e9d288c1d122;p=thirdparty%2Fkernel%2Fstable-queue.git remove bdi patch per Jens's request. --- diff --git a/review-2.6.35/bdi-fix-warnings-in-__mark_inode_dirty-for-dev-zero-and-friends.patch b/review-2.6.35/bdi-fix-warnings-in-__mark_inode_dirty-for-dev-zero-and-friends.patch deleted file mode 100644 index d5cbbbd55ae..00000000000 --- a/review-2.6.35/bdi-fix-warnings-in-__mark_inode_dirty-for-dev-zero-and-friends.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 692ebd17c2905313fff3c504c249c6a0faad16ec Mon Sep 17 00:00:00 2001 -From: Jan Kara -Date: Tue, 21 Sep 2010 11:51:01 +0200 -Subject: bdi: Fix warnings in __mark_inode_dirty for /dev/zero and friends - -From: Jan Kara - -commit 692ebd17c2905313fff3c504c249c6a0faad16ec upstream. - -Inodes of devices such as /dev/zero can get dirty for example via -utime(2) syscall or due to atime update. Backing device of such inodes -(zero_bdi, etc.) is however unable to handle dirty inodes and thus -__mark_inode_dirty complains. In fact, inode should be rather dirtied -against backing device of the filesystem holding it. This is generally a -good rule except for filesystems such as 'bdev' or 'mtd_inodefs'. Inodes -in these pseudofilesystems are referenced from ordinary filesystem -inodes and carry mapping with real data of the device. Thus for these -inodes we have to use inode->i_mapping->backing_dev_info as we did so -far. We distinguish these filesystems by checking whether sb->s_bdi -points to a non-trivial backing device or not. - -Example: Assume we have an ext3 filesystem on /dev/sda1 mounted on /. -There's a device inode A described by a path "/dev/sdb" on this -filesystem. This inode will be dirtied against backing device "8:0" -after this patch. bdev filesystem contains block device inode B coupled -with our inode A. When someone modifies a page of /dev/sdb, it's B that -gets dirtied and the dirtying happens against the backing device "8:16". -Thus both inodes get filed to a correct bdi list. - -Signed-off-by: Jan Kara -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman - ---- - fs/fs-writeback.c | 23 +++++++++++++++++++++-- - 1 file changed, 21 insertions(+), 2 deletions(-) - ---- a/fs/fs-writeback.c -+++ b/fs/fs-writeback.c -@@ -28,8 +28,6 @@ - #include - #include "internal.h" - --#define inode_to_bdi(inode) ((inode)->i_mapping->backing_dev_info) -- - /* - * We don't actually have pdflush, but this one is exported though /proc... - */ -@@ -62,6 +60,27 @@ int writeback_in_progress(struct backing - return !list_empty(&bdi->work_list); - } - -+static inline struct backing_dev_info *inode_to_bdi(struct inode *inode) -+{ -+ struct super_block *sb = inode->i_sb; -+ struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info; -+ -+ /* -+ * For inodes on standard filesystems, we use superblock's bdi. For -+ * inodes on virtual filesystems, we want to use inode mapping's bdi -+ * because they can possibly point to something useful (think about -+ * block_dev filesystem). -+ */ -+ if (sb->s_bdi && sb->s_bdi != &noop_backing_dev_info) { -+ /* Some device inodes could play dirty tricks. Catch them... */ -+ WARN(bdi != sb->s_bdi && bdi_cap_writeback_dirty(bdi), -+ "Dirtiable inode bdi %s != sb bdi %s\n", -+ bdi->name, sb->s_bdi->name); -+ return sb->s_bdi; -+ } -+ return bdi; -+} -+ - static void bdi_queue_work(struct backing_dev_info *bdi, - struct wb_writeback_work *work) - { diff --git a/review-2.6.35/series b/review-2.6.35/series index 53bd80fcfdc..83d03e50957 100644 --- a/review-2.6.35/series +++ b/review-2.6.35/series @@ -34,7 +34,6 @@ sched-fix-user-time-incorrectly-accounted-as-system-time-on-32-bit.patch oprofile-add-support-for-intel-cpu-family-6-model-22-intel-celeron-540.patch drm-i915-agp-intel-add-second-set-of-pci-ids-for-b43.patch bdi-initialize-noop_backing_dev_info-properly.patch -bdi-fix-warnings-in-__mark_inode_dirty-for-dev-zero-and-friends.patch char-mark-dev-zero-and-dev-kmem-as-not-capable-of-writeback.patch drivers-pci-intel-iommu.c-fix-build-with-older-gcc-s.patch mmap-call-unlink_anon_vmas-in-__split_vma-in-case-of-error.patch