summaryrefslogtreecommitdiffstats
path: root/freed-ora
diff options
context:
space:
mode:
Diffstat (limited to 'freed-ora')
-rw-r--r--freed-ora/current/f15/block-readahead-block-plug.patch92
-rw-r--r--freed-ora/current/f15/block-stray-block-put-after-teardown.patch11
-rw-r--r--freed-ora/current/f15/e1000e-Avoid-wrong-check-on-TX-hang.patch95
-rw-r--r--freed-ora/current/f15/fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch106
-rw-r--r--freed-ora/current/f15/jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch91
-rw-r--r--freed-ora/current/f15/kernel.spec31
6 files changed, 302 insertions, 124 deletions
diff --git a/freed-ora/current/f15/block-readahead-block-plug.patch b/freed-ora/current/f15/block-readahead-block-plug.patch
new file mode 100644
index 000000000..0b7bca650
--- /dev/null
+++ b/freed-ora/current/f15/block-readahead-block-plug.patch
@@ -0,0 +1,92 @@
+commit 3deaa7190a8da38453c4fabd9dec7f66d17fff67
+Author: Shaohua Li <shaohua.li@intel.com>
+Date: Fri Feb 3 15:37:17 2012 -0800
+
+ readahead: fix pipeline break caused by block plug
+
+ Herbert Poetzl reported a performance regression since 2.6.39. The test
+ is a simple dd read, but with big block size. The reason is:
+
+ T1: ra (A, A+128k), (A+128k, A+256k)
+ T2: lock_page for page A, submit the 256k
+ T3: hit page A+128K, ra (A+256k, A+384). the range isn't submitted
+ because of plug and there isn't any lock_page till we hit page A+256k
+ because all pages from A to A+256k is in memory
+ T4: hit page A+256k, ra (A+384, A+ 512). Because of plug, the range isn't
+ submitted again.
+ T5: lock_page A+256k, so (A+256k, A+512k) will be submitted. The task is
+ waitting for (A+256k, A+512k) finish.
+
+ There is no request to disk in T3 and T4, so readahead pipeline breaks.
+
+ We really don't need block plug for generic_file_aio_read() for buffered
+ I/O. The readahead already has plug and has fine grained control when I/O
+ should be submitted. Deleting plug for buffered I/O fixes the regression.
+
+ One side effect is plug makes the request size 256k, the size is 128k
+ without it. This is because default ra size is 128k and not a reason we
+ need plug here.
+
+ Vivek said:
+
+ : We submit some readahead IO to device request queue but because of nested
+ : plug, queue never gets unplugged. When read logic reaches a page which is
+ : not in page cache, it waits for page to be read from the disk
+ : (lock_page_killable()) and that time we flush the plug list.
+ :
+ : So effectively read ahead logic is kind of broken in parts because of
+ : nested plugging. Removing top level plug (generic_file_aio_read()) for
+ : buffered reads, will allow unplugging queue earlier for readahead.
+
+ Signed-off-by: Shaohua Li <shaohua.li@intel.com>
+ Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
+ Reported-by: Herbert Poetzl <herbert@13thfloor.at>
+ Tested-by: Eric Dumazet <eric.dumazet@gmail.com>
+ Cc: Christoph Hellwig <hch@infradead.org>
+ Cc: Jens Axboe <axboe@kernel.dk>
+ Cc: Vivek Goyal <vgoyal@redhat.com>
+ Cc: <stable@vger.kernel.org>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/mm/filemap.c b/mm/filemap.c
+index 97f49ed..b662757 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -1400,15 +1400,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long seg = 0;
+ size_t count;
+ loff_t *ppos = &iocb->ki_pos;
+- struct blk_plug plug;
+
+ count = 0;
+ retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
+ if (retval)
+ return retval;
+
+- blk_start_plug(&plug);
+-
+ /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
+ if (filp->f_flags & O_DIRECT) {
+ loff_t size;
+@@ -1424,8 +1421,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
+ retval = filemap_write_and_wait_range(mapping, pos,
+ pos + iov_length(iov, nr_segs) - 1);
+ if (!retval) {
++ struct blk_plug plug;
++
++ blk_start_plug(&plug);
+ retval = mapping->a_ops->direct_IO(READ, iocb,
+ iov, pos, nr_segs);
++ blk_finish_plug(&plug);
+ }
+ if (retval > 0) {
+ *ppos = pos + retval;
+@@ -1481,7 +1482,6 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
+ break;
+ }
+ out:
+- blk_finish_plug(&plug);
+ return retval;
+ }
+ EXPORT_SYMBOL(generic_file_aio_read);
diff --git a/freed-ora/current/f15/block-stray-block-put-after-teardown.patch b/freed-ora/current/f15/block-stray-block-put-after-teardown.patch
deleted file mode 100644
index f4bf9c40c..000000000
--- a/freed-ora/current/f15/block-stray-block-put-after-teardown.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.6.39.noarch/block/elevator.c~ 2011-08-09 10:07:41.532774872 -0400
-+++ linux-2.6.39.noarch/block/elevator.c 2011-08-09 10:07:56.131724173 -0400
-@@ -815,7 +815,7 @@ void elv_completed_request(struct reques
- */
- if (blk_account_rq(rq)) {
- q->in_flight[rq_is_sync(rq)]--;
-- if ((rq->cmd_flags & REQ_SORTED) &&
-+ if ((rq->cmd_flags & REQ_SORTED) && e->ops &&
- e->ops->elevator_completed_req_fn)
- e->ops->elevator_completed_req_fn(q, rq);
- }
diff --git a/freed-ora/current/f15/e1000e-Avoid-wrong-check-on-TX-hang.patch b/freed-ora/current/f15/e1000e-Avoid-wrong-check-on-TX-hang.patch
new file mode 100644
index 000000000..6064ddde8
--- /dev/null
+++ b/freed-ora/current/f15/e1000e-Avoid-wrong-check-on-TX-hang.patch
@@ -0,0 +1,95 @@
+From 09357b00255c233705b1cf6d76a8d147340545b8 Mon Sep 17 00:00:00 2001
+From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Date: Fri, 18 Nov 2011 14:25:00 +0000
+Subject: [PATCH] e1000e: Avoid wrong check on TX hang
+
+Based on the original patch submitted my Michael Wang
+<wangyun@linux.vnet.ibm.com>.
+Descriptors may not be write-back while checking TX hang with flag
+FLAG2_DMA_BURST on.
+So when we detect hang, we just flush the descriptor and detect
+again for once.
+
+-v2 change 1 to true and 0 to false and remove extra ()
+
+CC: Michael Wang <wangyun@linux.vnet.ibm.com>
+CC: Flavio Leitner <fbl@redhat.com>
+Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
+Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+---
+ drivers/net/ethernet/intel/e1000e/e1000.h | 1 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 23 ++++++++++++++++++++---
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
+index 9fe18d1..f478a22 100644
+--- a/drivers/net/ethernet/intel/e1000e/e1000.h
++++ b/drivers/net/ethernet/intel/e1000e/e1000.h
+@@ -309,6 +309,7 @@ struct e1000_adapter {
+ u32 txd_cmd;
+
+ bool detect_tx_hung;
++ bool tx_hang_recheck;
+ u8 tx_timeout_factor;
+
+ u32 tx_int_delay;
+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
+index c6e9763..c12df69 100644
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -1014,6 +1014,7 @@ static void e1000_print_hw_hang(struct work_struct *work)
+ struct e1000_adapter *adapter = container_of(work,
+ struct e1000_adapter,
+ print_hang_task);
++ struct net_device *netdev = adapter->netdev;
+ struct e1000_ring *tx_ring = adapter->tx_ring;
+ unsigned int i = tx_ring->next_to_clean;
+ unsigned int eop = tx_ring->buffer_info[i].next_to_watch;
+@@ -1025,6 +1026,21 @@ static void e1000_print_hw_hang(struct work_struct *work)
+ if (test_bit(__E1000_DOWN, &adapter->state))
+ return;
+
++ if (!adapter->tx_hang_recheck &&
++ (adapter->flags2 & FLAG2_DMA_BURST)) {
++ /* May be block on write-back, flush and detect again
++ * flush pending descriptor writebacks to memory
++ */
++ ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
++ /* execute the writes immediately */
++ e1e_flush();
++ adapter->tx_hang_recheck = true;
++ return;
++ }
++ /* Real hang detected */
++ adapter->tx_hang_recheck = false;
++ netif_stop_queue(netdev);
++
+ e1e_rphy(hw, PHY_STATUS, &phy_status);
+ e1e_rphy(hw, PHY_1000T_STATUS, &phy_1000t_status);
+ e1e_rphy(hw, PHY_EXT_STATUS, &phy_ext_status);
+@@ -1145,10 +1161,10 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
+ if (tx_ring->buffer_info[i].time_stamp &&
+ time_after(jiffies, tx_ring->buffer_info[i].time_stamp
+ + (adapter->tx_timeout_factor * HZ)) &&
+- !(er32(STATUS) & E1000_STATUS_TXOFF)) {
++ !(er32(STATUS) & E1000_STATUS_TXOFF))
+ schedule_work(&adapter->print_hang_task);
+- netif_stop_queue(netdev);
+- }
++ else
++ adapter->tx_hang_recheck = false;
+ }
+ adapter->total_tx_bytes += total_tx_bytes;
+ adapter->total_tx_packets += total_tx_packets;
+@@ -3838,6 +3854,7 @@ static int e1000_open(struct net_device *netdev)
+
+ e1000_irq_enable(adapter);
+
++ adapter->tx_hang_recheck = false;
+ netif_start_queue(netdev);
+
+ adapter->idle_check = true;
+--
+1.7.9
+
diff --git a/freed-ora/current/f15/fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch b/freed-ora/current/f15/fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch
deleted file mode 100644
index 5bab4f4ad..000000000
--- a/freed-ora/current/f15/fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Path: news.gmane.org!not-for-mail
-From: Niels de Vos <ndevos@redhat.com>
-Newsgroups: gmane.linux.kernel,gmane.linux.file-systems
-Subject: [PATCH v2] fs: Invalidate the cache for a parent block-device if fsync() is called for a partition
-Date: Mon, 23 Jan 2012 10:38:29 +0000
-Lines: 58
-Approved: news@gmane.org
-Message-ID: <1327315109-7740-1-git-send-email-ndevos@redhat.com>
-References: <4F19356E.3020708@redhat.com>
-NNTP-Posting-Host: lo.gmane.org
-X-Trace: dough.gmane.org 1327315263 30652 80.91.229.12 (23 Jan 2012 10:41:03 GMT)
-X-Complaints-To: usenet@dough.gmane.org
-NNTP-Posting-Date: Mon, 23 Jan 2012 10:41:03 +0000 (UTC)
-Cc: linux-kernel@vger.kernel.org, Niels de Vos <ndevos@redhat.com>,
- "Bryn M. Reeves" <bmr@redhat.com>,
- Mikulas Patocka <mpatocka@redhat.com>
-To: linux-fsdevel@vger.kernel.org
-Original-X-From: linux-kernel-owner@vger.kernel.org Mon Jan 23 11:40:58 2012
-Return-path: <linux-kernel-owner@vger.kernel.org>
-Envelope-to: glk-linux-kernel-3@lo.gmane.org
-Original-Received: from vger.kernel.org ([209.132.180.67])
- by lo.gmane.org with esmtp (Exim 4.69)
- (envelope-from <linux-kernel-owner@vger.kernel.org>)
- id 1RpHKb-0008Bu-Fh
- for glk-linux-kernel-3@lo.gmane.org; Mon, 23 Jan 2012 11:40:57 +0100
-Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S1753263Ab2AWKkt (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
- Mon, 23 Jan 2012 05:40:49 -0500
-Original-Received: from mx1.redhat.com ([209.132.183.28]:58739 "EHLO mx1.redhat.com"
- rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
- id S1751990Ab2AWKks (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
- Mon, 23 Jan 2012 05:40:48 -0500
-Original-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0NAelMx027033
- (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
- Mon, 23 Jan 2012 05:40:47 -0500
-Original-Received: from ndevos.usersys.redhat.com (dhcp-1-51.fab.redhat.com [10.33.1.51])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q0NAejLn013691;
- Mon, 23 Jan 2012 05:40:46 -0500
-In-Reply-To: <4F19356E.3020708@redhat.com>
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
-Original-Sender: linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel@vger.kernel.org
-Xref: news.gmane.org gmane.linux.kernel:1242432 gmane.linux.file-systems:60751
-Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1242432>
-
-Executing an fsync() on a file-descriptor of a partition flushes the
-caches for that partition by calling blkdev_issue_flush(). However, it
-seems that reading data through the parent device will still return the
-old cached data.
-
-The cache for the block-device is not synced if the block-device is kept
-open (due to a mounted partition, for example). Only when all users for
-the disk have exited, the cache for the disk is made consistent again.
-
-Calling invalidate_bdev() on the parent block-device in case
-blkdev_fsync() was called for a partition, fixes this.
-
-The problem can be worked around by forcing the caches to be flushed
-with either
- # blockdev --flushbufs ${dev_disk}
-or
- # echo 3 > /proc/sys/vm/drop_caches
-
-CC: Bryn M. Reeves <bmr@redhat.com>
-CC: Mikulas Patocka <mpatocka@redhat.com>
-Signed-off-by: Niels de Vos <ndevos@redhat.com>
-
----
-v2:
-- Do not call invalidate_bdev() from blkdev_issue_flush() and prevent
- performance degration with journalled filesystems.
-
- Suggested was to call invalidate_bdev() in fsync_bdev(), but this is
- not in the call-path of mkfs.ext3 and similar tools. Hence the issue
- persists.
-
-- Correct phrasing a little, changing ioctl-BLKFLSBUF is not required.
-
-- This issue also occurs when doing an ioctl-BLKFLSBUF on a partition.
- Reading the whole disk will still return cached data. If this is an
- issue, it will need a seperate patch.
----
- fs/block_dev.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 0e575d1..433c4de 100644
---- a/fs/block_dev.c
-+++ b/fs/block_dev.c
-@@ -424,6 +424,10 @@ int blkdev_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
- if (error == -EOPNOTSUPP)
- error = 0;
-
-+ /* invalidate parent block_device */
-+ if (!error && bdev != bdev->bd_contains)
-+ invalidate_bdev(bdev->bd_contains);
-+
- return error;
- }
- EXPORT_SYMBOL(blkdev_fsync);
---
-1.7.6.5
-
diff --git a/freed-ora/current/f15/jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch b/freed-ora/current/f15/jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
new file mode 100644
index 000000000..5ea8ccc10
--- /dev/null
+++ b/freed-ora/current/f15/jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
@@ -0,0 +1,91 @@
+Path: news.gmane.org!not-for-mail
+From: Eric Sandeen <sandeen@redhat.com>
+Newsgroups: gmane.comp.file-systems.ext4
+Subject: [PATCH] jbd2: clear BH_Delay & BH_Unwritten in journal_unmap_buffer
+Date: Tue, 07 Feb 2012 16:07:20 -0600
+Lines: 42
+Approved: news@gmane.org
+Message-ID: <4F31A098.4050601@redhat.com>
+NNTP-Posting-Host: plane.gmane.org
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Trace: dough.gmane.org 1328656072 12026 80.91.229.3 (7 Feb 2012 23:07:52 GMT)
+X-Complaints-To: usenet@dough.gmane.org
+NNTP-Posting-Date: Tue, 7 Feb 2012 23:07:52 +0000 (UTC)
+To: ext4 development <linux-ext4@vger.kernel.org>
+Original-X-From: linux-ext4-owner@vger.kernel.org Wed Feb 08 00:07:52 2012
+Return-path: <linux-ext4-owner@vger.kernel.org>
+Envelope-to: gcfe-linux-ext4@plane.gmane.org
+Original-Received: from vger.kernel.org ([209.132.180.67])
+ by plane.gmane.org with esmtp (Exim 4.69)
+ (envelope-from <linux-ext4-owner@vger.kernel.org>)
+ id 1Ruu8d-0000lK-5P
+ for gcfe-linux-ext4@plane.gmane.org; Wed, 08 Feb 2012 00:07:51 +0100
+Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+ id S1756187Ab2BGXHt (ORCPT <rfc822;gcfe-linux-ext4@m.gmane.org>);
+ Tue, 7 Feb 2012 18:07:49 -0500
+Original-Received: from mx1.redhat.com ([209.132.183.28]:19432 "EHLO mx1.redhat.com"
+ rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
+ id S1753992Ab2BGXHs (ORCPT <rfc822;linux-ext4@vger.kernel.org>);
+ Tue, 7 Feb 2012 18:07:48 -0500
+Original-Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
+ by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q17N7dj0027622
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
+ for <linux-ext4@vger.kernel.org>; Tue, 7 Feb 2012 18:07:48 -0500
+Original-Received: from liberator.sandeen.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])
+ by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q17M7Kgt001990
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
+ for <linux-ext4@vger.kernel.org>; Tue, 7 Feb 2012 17:07:21 -0500
+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0) Gecko/20120129 Thunderbird/10.0
+X-Enigmail-Version: 1.3.5
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
+Original-Sender: linux-ext4-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-ext4.vger.kernel.org>
+X-Mailing-List: linux-ext4@vger.kernel.org
+Xref: news.gmane.org gmane.comp.file-systems.ext4:30623
+Archived-At: <http://permalink.gmane.org/gmane.comp.file-systems.ext4/30623>
+
+journal_unmap_buffer()'s zap_buffer: code clears a lot of buffer head
+state ala discard_buffer(), but does not touch _Delay or _Unwritten
+as discard_buffer() does.
+
+This can be problematic in some areas of the ext4 code which assume
+that if they have found a buffer marked unwritten or delay, then it's
+a live one. Perhaps those spots should check whether it is mapped
+as well, but if jbd2 is going to tear down a buffer, let's really
+tear it down completely.
+
+Without this I get some fsx failures on sub-page-block filesystems
+up until v3.2, at which point 4e96b2dbbf1d7e81f22047a50f862555a6cb87cb
+and 189e868fa8fdca702eb9db9d8afc46b5cb9144c9 make the failures go
+away, because buried within that large change is some more flag
+clearing. I still think it's worth doing in jbd2, since
+->invalidatepage leads here directly, and it's the right place
+to clear away these flags.
+
+Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+Cc: stable@vger.kernel.org
+---
+
+diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
+index 35ae096..52653306 100644
+--- a/fs/jbd2/transaction.c
++++ b/fs/jbd2/transaction.c
+@@ -1949,6 +1949,8 @@ zap_buffer_unlocked:
+ clear_buffer_mapped(bh);
+ clear_buffer_req(bh);
+ clear_buffer_new(bh);
++ clear_buffer_delay(bh);
++ clear_buffer_unwritten(bh);
+ bh->b_bdev = NULL;
+ return may_free;
+ }
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
diff --git a/freed-ora/current/f15/kernel.spec b/freed-ora/current/f15/kernel.spec
index 20eb439d7..e4b8289ba 100644
--- a/freed-ora/current/f15/kernel.spec
+++ b/freed-ora/current/f15/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# When changing real_sublevel below, reset this by hand to 1
# (or to 0 and then use rpmdev-bumpspec).
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# real_sublevel is the 3.x kernel version we're starting with
@@ -665,7 +665,8 @@ Patch3500: jbd-jbd2-validate-sb-s_first-in-journal_get_superblo.patch
Patch12016: disable-i8042-check-on-apple-mac.patch
-Patch12026: block-stray-block-put-after-teardown.patch
+Patch12025: block-readahead-block-plug.patch
+
Patch12030: epoll-limit-paths.patch
Patch12303: dmar-disable-when-ricoh-multifunction.patch
@@ -710,12 +711,15 @@ Patch21082: procfs-parse-mount-options.patch
Patch21083: procfs-add-hidepid-and-gid-mount-options.patch
Patch21084: proc-fix-null-pointer-deref-in-proc_pid_permission.patch
-#rhbz 783211
-Patch21087: fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch
+#rhbz 788260
+Patch21085: jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
Patch21091: bcma-brcmsmac-compat.patch
+#rhbz 785806
+Patch21092: e1000e-Avoid-wrong-check-on-TX-hang.patch
+
#rhbz 771058
Patch21100: msi-irq-sysfs-warning.patch
@@ -1292,7 +1296,7 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
ApplyPatch disable-i8042-check-on-apple-mac.patch
ApplyPatch epoll-limit-paths.patch
-ApplyPatch block-stray-block-put-after-teardown.patch
+ApplyPatch block-readahead-block-plug.patch
# rhbz#605888
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
@@ -1336,8 +1340,11 @@ ApplyPatch procfs-parse-mount-options.patch
ApplyPatch procfs-add-hidepid-and-gid-mount-options.patch
ApplyPatch proc-fix-null-pointer-deref-in-proc_pid_permission.patch
-#rhbz 783211
-ApplyPatch fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch
+#rhbz 788260
+ApplyPatch jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
+
+#rhbz 785806
+ApplyPatch e1000e-Avoid-wrong-check-on-TX-hang.patch
# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
ApplyPatch bcma-brcmsmac-compat.patch
@@ -1989,6 +1996,16 @@ fi
# and build.
%changelog
+* Wed Feb 08 2012 Josh Boyer <jwboyer@redhat.com>
+- CVE-2011-4086: jbd2: unmapped buffer with _Unwritten or _Delay flags
+ set can lead to DoS (rhbz 788260)
+- Drop patch that was NAKd upstream (rhbz 783211)
+- Fix e1000e Tx hang check (rhbz 785806)
+
+* Sun Feb 05 2012 Dave Jones <davej@redhat.com>
+- Remove unnecessary block-stray-block-put-after-teardown.patch
+- readahead: fix pipeline break caused by block plug
+
* Sat Feb 04 2012 Alexandre Oliva <lxoliva@fsfla.org> -libre
- Use patch-3.2-libre-3.2.3-libre as patch-libre-3.2.3.
OpenPOWER on IntegriCloud