3.0-stable patches

added patches:
	ext4-flush-any-pending-end_io-requests-before-dio-reads-w-dioread_nolock.patch
	jbd2-clear-bh_delay-bh_unwritten-in-journal_unmap_buffer.patch

diff --git a/queue-3.0/ext4-flush-any-pending-end_io-requests-before-dio-reads-w-dioread_nolock.patch b/queue-3.0/ext4-flush-any-pending-end_io-requests-before-dio-reads-w-dioread_nolock.patch
new file mode 100644 (file)
index 0000000..c7774fb
--- /dev/null
+++ b/queue-3.0/ext4-flush-any-pending-end_io-requests-before-dio-reads-w-dioread_nolock.patch
@@ -0,0 +1,58 @@
+From dccaf33fa37a1bc5d651baeb3bfeb6becb86597b Mon Sep 17 00:00:00 2001
+From: Jiaying Zhang <jiayingz@google.com>
+Date: Fri, 19 Aug 2011 19:13:32 -0400
+Subject: ext4: flush any pending end_io requests before DIO reads w/dioread_nolock
+
+From: Jiaying Zhang <jiayingz@google.com>
+
+commit dccaf33fa37a1bc5d651baeb3bfeb6becb86597b upstream.
+
+(backported to 3.0 by mjt)
+
+There is a race between ext4 buffer write and direct_IO read with
+dioread_nolock mount option enabled. The problem is that we clear
+PageWriteback flag during end_io time but will do
+uninitialized-to-initialized extent conversion later with dioread_nolock.
+If an O_direct read request comes in during this period, ext4 will return
+zero instead of the recently written data.
+
+This patch checks whether there are any pending uninitialized-to-initialized
+extent conversion requests before doing O_direct read to close the race.
+Note that this is just a bandaid fix. The fundamental issue is that we
+clear PageWriteback flag before we really complete an IO, which is
+problem-prone. To fix the fundamental issue, we may need to implement an
+extent tree cache that we can use to look up pending to-be-converted extents.
+
+Signed-off-by: Jiaying Zhang <jiayingz@google.com>
+Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+Cc: Jan Kara <jack@suse.cz>
+Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ fs/ext4/inode.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+--- a/fs/ext4/inode.c
++++ b/fs/ext4/inode.c
+@@ -3510,12 +3510,17 @@ static ssize_t ext4_ind_direct_IO(int rw
+       }
+ 
+ retry:
+-      if (rw == READ && ext4_should_dioread_nolock(inode))
++      if (rw == READ && ext4_should_dioread_nolock(inode)) {
++              if (unlikely(!list_empty(&ei->i_completed_io_list))) {
++                      mutex_lock(&inode->i_mutex);
++                      ext4_flush_completed_IO(inode);
++                      mutex_unlock(&inode->i_mutex);
++              }
+               ret = __blockdev_direct_IO(rw, iocb, inode,
+                                inode->i_sb->s_bdev, iov,
+                                offset, nr_segs,
+                                ext4_get_block, NULL, NULL, 0);
+-      else {
++      } else {
+               ret = blockdev_direct_IO(rw, iocb, inode,
+                                inode->i_sb->s_bdev, iov,
+                                offset, nr_segs,

diff --git a/queue-3.0/jbd2-clear-bh_delay-bh_unwritten-in-journal_unmap_buffer.patch b/queue-3.0/jbd2-clear-bh_delay-bh_unwritten-in-journal_unmap_buffer.patch
new file mode 100644 (file)
index 0000000..75bd313
--- /dev/null
+++ b/queue-3.0/jbd2-clear-bh_delay-bh_unwritten-in-journal_unmap_buffer.patch
@@ -0,0 +1,46 @@
+From 15291164b22a357cb211b618adfef4fa82fc0de3 Mon Sep 17 00:00:00 2001
+From: Eric Sandeen <sandeen@redhat.com>
+Date: Mon, 20 Feb 2012 17:53:01 -0500
+Subject: jbd2: clear BH_Delay & BH_Unwritten in journal_unmap_buffer
+
+From: Eric Sandeen <sandeen@redhat.com>
+
+commit 15291164b22a357cb211b618adfef4fa82fc0de3 upstream.
+
+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>
+Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/jbd2/transaction.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/fs/jbd2/transaction.c
++++ b/fs/jbd2/transaction.c
+@@ -1902,6 +1902,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;
+ }

diff --git a/queue-3.0/series b/queue-3.0/series
index 216eb7d80bd1e818aeb8b57f6a703f6dea113342..fd103be661422dbe260adccafde1f72c93414680 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -78,3 +78,5 @@ lgdt330x-fix-signedness-error-in-i2c_read_demod_bytes.patch
 pvrusb2-fix-7mhz-8mhz-dvb-t-tuner-support-for-hvr1900-rev-d1f5.patch
 e1000e-avoid-wrong-check-on-tx-hang.patch
 pm-hibernate-enable-usermodehelpers-in-hibernate-error-path.patch
+ext4-flush-any-pending-end_io-requests-before-dio-reads-w-dioread_nolock.patch
+jbd2-clear-bh_delay-bh_unwritten-in-journal_unmap_buffer.patch