From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 31 Aug 2012 00:46:00 +0000 (-0700)
Subject: 3.5-stable patches
X-Git-Tag: v3.5.4~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84b87dd5fc73ad0be992851b5595ef5b26a2fc88;p=thirdparty%2Fkernel%2Fstable-queue.git

3.5-stable patches

added patches:
	jbd-don-t-write-superblock-when-unmounting-an-ro-filesystem.patch
---

diff --git a/queue-3.5/jbd-don-t-write-superblock-when-unmounting-an-ro-filesystem.patch b/queue-3.5/jbd-don-t-write-superblock-when-unmounting-an-ro-filesystem.patch
new file mode 100644
index 00000000000..febef67d716
--- /dev/null
+++ b/queue-3.5/jbd-don-t-write-superblock-when-unmounting-an-ro-filesystem.patch
@@ -0,0 +1,46 @@
+From 2e84f2641ea91a730642ead558a4ee3bd52310c9 Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Wed, 15 Aug 2012 13:50:27 +0200
+Subject: jbd: don't write superblock when unmounting an ro filesystem
+
+From: Jan Kara <jack@suse.cz>
+
+commit 2e84f2641ea91a730642ead558a4ee3bd52310c9 upstream.
+
+This sequence:
+
+results in an IO error when unmounting the RO filesystem. The bug was
+introduced by:
+
+commit 9754e39c7bc51328f145e933bfb0df47cd67b6e9
+Author: Jan Kara <jack@suse.cz>
+Date:   Sat Apr 7 12:33:03 2012 +0200
+
+    jbd: Split updating of journal superblock and marking journal empty
+
+which lost some of the magic in journal_update_superblock() which
+used to test for a journal with no outstanding transactions.
+
+This is a port of a jbd2 fix by Eric Sandeen.
+
+Signed-off-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/jbd/journal.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/fs/jbd/journal.c
++++ b/fs/jbd/journal.c
+@@ -1113,6 +1113,11 @@ static void mark_journal_empty(journal_t
+ 
+ 	BUG_ON(!mutex_is_locked(&journal->j_checkpoint_mutex));
+ 	spin_lock(&journal->j_state_lock);
++	/* Is it already empty? */
++	if (sb->s_start == 0) {
++		spin_unlock(&journal->j_state_lock);
++		return;
++	}
+ 	jbd_debug(1, "JBD: Marking journal as empty (seq %d)\n",
+         	  journal->j_tail_sequence);
+ 
diff --git a/queue-3.5/series b/queue-3.5/series
index 3b7fd7710d3..ff0f422f174 100644
--- a/queue-3.5/series
+++ b/queue-3.5/series
@@ -55,3 +55,4 @@ ath9k-fix-decrypt_error-initialization-in-ath_rx_tasklet.patch
 pci-ehci-fix-crash-during-hibernation-on-asus-computers.patch
 gma500-consider-crtc-initially-active.patch
 block-replace-__getblk_slow-misfix-by-grow_dev_page-fix.patch
+jbd-don-t-write-superblock-when-unmounting-an-ro-filesystem.patch